diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp
index 033efe147..c022dde1d 100644
--- a/src/libtomahawk/audio/AudioEngine.cpp
+++ b/src/libtomahawk/audio/AudioEngine.cpp
@@ -552,7 +552,9 @@ AudioEngine::loadNextTrack()
 
     if ( m_queue && m_queue->trackCount() )
     {
-        result = m_queue->nextResult();
+        query_ptr query = m_queue->tracks().first();
+        if ( query && query->numResults() )
+            result = query->results().first();
     }
 
     if ( !m_playlist.isNull() && result.isNull() )
@@ -562,7 +564,6 @@ AudioEngine::loadNextTrack()
         if ( m_playlist.data()->hasNextResult() )
         {
             result = m_playlist.data()->nextResult();
-            tDebug() << Q_FUNC_INFO << result->toString();
             m_currentTrackPlaylist = m_playlist;
         }
     }