diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp
index cc71e6a93..7beb26b4a 100644
--- a/src/libtomahawk/audio/audioengine.cpp
+++ b/src/libtomahawk/audio/audioengine.cpp
@@ -211,15 +211,7 @@ AudioEngine::canGoNext()
          m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkipForwards )
         return false;
 
-    if ( !m_currentTrack.isNull() && !m_playlist.data()->hasNextItem() &&
-         ( m_playlist.data()->currentItem().isNull() || ( m_currentTrack->id() == m_playlist.data()->currentItem()->id() ) ) )
-    {
-        //For instance, when doing a catch-up while listening along, but the person
-        //you're following hasn't started a new track yet...don't do anything
-        return false;
-    }
-
-    return true;
+    return m_playlist.data()->hasNextItem();
 }
 
 bool