diff --git a/src/musikbox/app/service/PlaybackService.cpp b/src/musikbox/app/service/PlaybackService.cpp
index 44b331c9a..181571d8b 100755
--- a/src/musikbox/app/service/PlaybackService.cpp
+++ b/src/musikbox/app/service/PlaybackService.cpp
@@ -141,7 +141,9 @@ void PlaybackService::ProcessMessage(IMessage &message) {
         }
     }
     else if (message.Type() == MESSAGE_PREPARE_NEXT_TRACK) {
-        this->PrepareNextTrack();
+        if (transport.GetPlaybackState() != ITransport::PlaybackStopped) {
+            this->PrepareNextTrack();
+        }
     }
 }