diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 30c4162517..3d1f1b3d70 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -2448,8 +2448,10 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 		Message msg("SongFinished");
 		MESSAGEMAN->Broadcast(msg);
 		
-		if (SONGMAN->playlistcourse != "")
+		if (SONGMAN->playlistcourse != "") {
 			SONGMAN->allplaylists[SONGMAN->playlistcourse].courseruns.emplace_back(playlistscorekeys);
+			SONGMAN->playlistcourse = "";
+		}
 
 		TweenOffScreen();