diff --git a/src/game/client/neo/neo_mp3player.cpp b/src/game/client/neo/neo_mp3player.cpp
index e9fb60ee4..2d8141db1 100644
--- a/src/game/client/neo/neo_mp3player.cpp
+++ b/src/game/client/neo/neo_mp3player.cpp
@@ -281,7 +281,11 @@ void Init()
 
 void Deinit()
 {
-	g_NeoMP3Thread.CallWorker(CNeoMP3Thread::EXIT);
+	if (g_NeoMP3Thread.IsAlive())
+	{
+		g_NeoMP3Thread.CallWorker(CNeoMP3Thread::EXIT);
+		g_NeoMP3Thread.Join();
+	}
 }
 
 void Update()