diff --git a/ryzom/client/src/interface_v3/music_player.cpp b/ryzom/client/src/interface_v3/music_player.cpp
index f4d8b7db9..717ea7e66 100644
--- a/ryzom/client/src/interface_v3/music_player.cpp
+++ b/ryzom/client/src/interface_v3/music_player.cpp
@@ -85,7 +85,7 @@ void CMusicPlayer::playSongs (const std::vector<CSongs> &songs)
 		rebuildPlaylist();
 
 	// If pause, stop, else play will resume
-	if (_State == Paused)
+	if (_State == Paused || _Songs.empty())
 		_State = Stopped;
 }