diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 70edf89cef..a03d96ac8f 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -968,9 +968,6 @@ void ScreenGameplay::LoadNextSong()
 		}
 	}
 
-	m_AutoKeysounds.FinishLoading();
-	m_pSoundMusic = m_AutoKeysounds.GetSound();
-
 	const bool bReverse[NUM_PLAYERS] = 
 	{
 		GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.m_fScrolls[PlayerOptions::SCROLL_REVERSE] == 1,
@@ -1079,6 +1076,11 @@ void ScreenGameplay::LoadNextSong()
 			}
 		}
 	}
+
+	/* Load the music last, since it may start streaming and we don't want the music
+	 * to compete with other loading. */
+	m_AutoKeysounds.FinishLoading();
+	m_pSoundMusic = m_AutoKeysounds.GetSound();
 }
 
 float ScreenGameplay::StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic)