diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp
index ec80e6da5..da8f88c34 100644
--- a/src/core/mixer.cpp
+++ b/src/core/mixer.cpp
@@ -354,8 +354,11 @@ mixer::~mixer()
 		for( int w = 0; w < m_numWorkers; ++w )
 		{
 			m_workers[w]->quit();
-			DISTRIBUTE_JOB_QUEUE(jq);
-			m_workers[w]->wait();
+			while( m_workers[w]->isRunning() )
+			{
+				DISTRIBUTE_JOB_QUEUE(jq);
+				m_workers[w]->wait( 50 );
+			}
 		}
 	}