diff --git a/src/i_winmusic.c b/src/i_winmusic.c
index b3d91a7c..46feeaa4 100644
--- a/src/i_winmusic.c
+++ b/src/i_winmusic.c
@@ -1478,7 +1478,7 @@ static void I_WIN_StopSong(void *handle)
 {
     MMRESULT mmr;
 
-    if (!hMidiStream)
+    if (!hPlayerThread)
     {
         return;
     }
@@ -1488,6 +1488,11 @@ static void I_WIN_StopSong(void *handle)
     CloseHandle(hPlayerThread);
     hPlayerThread = NULL;
 
+    if (!hMidiStream)
+    {
+        return;
+    }
+
     mmr = midiStreamStop(hMidiStream);
     if (mmr != MMSYSERR_NOERROR)
     {