diff --git a/stepmania/src/RageThreads.cpp b/stepmania/src/RageThreads.cpp
index bec4909cde..29aed19eeb 100644
--- a/stepmania/src/RageThreads.cpp
+++ b/stepmania/src/RageThreads.cpp
@@ -196,7 +196,8 @@ RageThread::RageThread()
 
 RageThread::~RageThread()
 {
-
+	if( m_pSlot != NULL )
+		Wait();
 }
 
 const char *ThreadSlot::GetThreadName() const