diff --git a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp
index bea5e558d5..d87a451f97 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp
@@ -115,6 +115,7 @@ InputHandler_DInput::InputHandler_DInput()
 			Devices[i].buffered? "buffered": "unbuffered" );
 	}
 
+	InputThreadPtr = NULL;
 	StartThread();
 }
 
@@ -125,7 +126,6 @@ void InputHandler_DInput::StartThread()
 		InputThreadPtr = SDL_CreateThread(InputThread_Start, this);
 	else
 		InputThreadPtr = NULL;
-
 }
 
 void InputHandler_DInput::ShutdownThread()