diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp
index e85c54bf9..74d21a7aa 100644
--- a/src/libtomahawk/audio/audioengine.cpp
+++ b/src/libtomahawk/audio/audioengine.cpp
@@ -212,8 +212,15 @@ AudioEngine::canGoNext()
          m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkipForwards )
         return false;
 
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO << "playlist has next item? " << m_playlist.data()->hasNextItem();
-
+    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
+        tDebug( LOGEXTRA ) << Q_FUNC_INFO << "catch up";
+        return false;
+    }
+    
     return m_playlist.data()->hasNextItem();
 }
 
diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp
index a87bf228f..4297caffe 100644
--- a/src/sourcetree/sourcetreeview.cpp
+++ b/src/sourcetree/sourcetreeview.cpp
@@ -370,11 +370,9 @@ SourceTreeView::latchOn()
         SourcePlaylistInterface* sourcepi = dynamic_cast< SourcePlaylistInterface* >( pi );
         if ( !sourcepi->source().isNull() && sourcepi->source()->id() == source->id() )
         {
-            //it's a catch-up -- if they're trying to catch-up in the same track, don't do anything
-            //so that you don't repeat the track and/or cause the retry timer to fire
-            if ( !AudioEngine::instance()->currentTrack().isNull() && !sourcepi->hasNextItem() &&
-                  AudioEngine::instance()->currentTrack()->id() == sourcepi->currentItem()->id() )
-                    return;
+            //it's a catch-up -- logic in audioengine should take care of it
+            AudioEngine::instance()->next();
+            return;
         }
     }