diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index e6011b3c1..0d15713ed 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -2016,7 +2016,8 @@ void KillDisplay()
 {
 	display_die = true;
 	SetEvent(display_wakeup_event);
-	sthread_join(display_thread);
+	if(display_thread)
+		sthread_join(display_thread);
 }
 
 void Display()