diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp
index 9f7068a977..5dc5a46216 100644
--- a/src/ScreenSelectMusic.cpp
+++ b/src/ScreenSelectMusic.cpp
@@ -1221,10 +1221,12 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 	if (SM == SM_BackFromNamePlaylist) {
 		Playlist pl;
 		pl.name = ScreenTextEntry::s_sLastAnswer;
-		SONGMAN->allplaylists.emplace(pl.name, pl);
-		SONGMAN->activeplaylist = pl.name;
-		Message msg("DisplayAll");
-		MESSAGEMAN->Broadcast(msg);
+		if (pl.name != "") {
+			SONGMAN->allplaylists.emplace(pl.name, pl);
+			SONGMAN->activeplaylist = pl.name;
+			Message msg("DisplayAll");
+			MESSAGEMAN->Broadcast(msg);
+		}
 	}
 
 	ScreenWithMenuElements::HandleScreenMessage( SM );