diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp
index b1e610a0c..fbec7cae2 100644
--- a/src/libtomahawk/audio/AudioEngine.cpp
+++ b/src/libtomahawk/audio/AudioEngine.cpp
@@ -535,7 +535,7 @@ AudioEngine::loadNextTrack()
 
     Tomahawk::result_ptr result;
 
-    if ( !m_stopAfterTrack.isNull() )
+    if ( !m_stopAfterTrack.isNull() && !m_currentTrack.isNull() )
     {
         if ( m_stopAfterTrack->equals( m_currentTrack->toQuery() ) )
         {