diff --git a/src/libtomahawk/SourcePlaylistInterface.cpp b/src/libtomahawk/SourcePlaylistInterface.cpp
index 5e10f3b25..444ab1d22 100644
--- a/src/libtomahawk/SourcePlaylistInterface.cpp
+++ b/src/libtomahawk/SourcePlaylistInterface.cpp
@@ -180,8 +180,9 @@ SourcePlaylistInterface::resolvingFinished( bool hasResults )
     if ( hasResults )
     {
         m_gotNextItem = true;
-        emit nextTrackAvailable();
     }
+
+    emit nextTrackAvailable( hasResults );
 }
 
 
diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp
index 978e3e286..35af08c17 100644
--- a/src/libtomahawk/audio/AudioEngine.cpp
+++ b/src/libtomahawk/audio/AudioEngine.cpp
@@ -839,16 +839,16 @@ AudioEngine::setQueue( const playlistinterface_ptr& queue )
 {
     if ( m_queue )
     {
-        disconnect( m_queue.data(), SIGNAL( previousTrackAvailable() ), this, SIGNAL( controlStateChanged() ) );
-        disconnect( m_queue.data(), SIGNAL( nextTrackAvailable() ), this, SIGNAL( controlStateChanged() ) );
+        disconnect( m_queue.data(), SIGNAL( previousTrackAvailable( bool ) ), this, SIGNAL( controlStateChanged() ) );
+        disconnect( m_queue.data(), SIGNAL( nextTrackAvailable( bool ) ), this, SIGNAL( controlStateChanged() ) );
     }
 
     m_queue = queue;
 
     if ( m_queue )
     {
-        connect( m_queue.data(), SIGNAL( previousTrackAvailable() ), SIGNAL( controlStateChanged() ) );
-        connect( m_queue.data(), SIGNAL( nextTrackAvailable() ), SIGNAL( controlStateChanged() ) );
+        connect( m_queue.data(), SIGNAL( previousTrackAvailable( bool ) ), SIGNAL( controlStateChanged() ) );
+        connect( m_queue.data(), SIGNAL( nextTrackAvailable( bool ) ), SIGNAL( controlStateChanged() ) );
     }
 }
 
@@ -863,8 +863,8 @@ AudioEngine::setPlaylist( Tomahawk::playlistinterface_ptr playlist )
     {
         if ( m_playlist.data() )
         {
-            disconnect( m_playlist.data(), SIGNAL( previousTrackAvailable() ) );
-            disconnect( m_playlist.data(), SIGNAL( nextTrackAvailable() ) );
+            disconnect( m_playlist.data(), SIGNAL( previousTrackAvailable( bool ) ) );
+            disconnect( m_playlist.data(), SIGNAL( nextTrackAvailable( bool ) ) );
         }
 
         m_playlist.data()->reset();
@@ -882,10 +882,10 @@ AudioEngine::setPlaylist( Tomahawk::playlistinterface_ptr playlist )
 
     if ( !m_playlist.isNull() )
     {
-        connect( m_playlist.data(), SIGNAL( nextTrackAvailable() ), SLOT( onPlaylistNextTrackAvailable() ) );
+        connect( m_playlist.data(), SIGNAL( nextTrackAvailable( bool ) ), SLOT( onPlaylistNextTrackAvailable() ) );
 
-        connect( m_playlist.data(), SIGNAL( previousTrackAvailable() ), SIGNAL( controlStateChanged() ) );
-        connect( m_playlist.data(), SIGNAL( nextTrackAvailable() ), SIGNAL( controlStateChanged() ) );
+        connect( m_playlist.data(), SIGNAL( previousTrackAvailable( bool ) ), SIGNAL( controlStateChanged() ) );
+        connect( m_playlist.data(), SIGNAL( nextTrackAvailable( bool ) ), SIGNAL( controlStateChanged() ) );
     }
 
     emit playlistChanged( playlist );