diff --git a/src/lms/ui/PlayQueueView.cpp b/src/lms/ui/PlayQueueView.cpp
index b634429d..34c82186 100644
--- a/src/lms/ui/PlayQueueView.cpp
+++ b/src/lms/ui/PlayQueueView.cpp
@@ -224,7 +224,7 @@ PlayQueue::loadTrack(std::size_t pos, bool play)
 		// If out of range, stop playing
 		if (pos >= tracklist->getCount())
 		{
-			if (!_repeatAll)
+			if (!_repeatAll || tracklist->getCount() == 0)
 			{
 				stop();
 				return;