diff --git a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
index bff375df5..7148a8c2d 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
@@ -50,6 +50,7 @@ DynamicModel::startOnDemand()
 {
     m_playlist->generator()->startOnDemand();
     
+    connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), this, SLOT( newTrackLoading() ) );
     m_onDemandRunning = true;
     m_startOnResolved = true;
 }
@@ -70,6 +71,8 @@ DynamicModel::stopOnDemand()
 {
     m_onDemandRunning = false;
     AudioEngine::instance()->stop();
+    
+    disconnect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), this, SLOT( newTrackLoading() ) );
 }
 
 
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
index d476abb83..9b5afa5dc 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
@@ -240,15 +240,11 @@ DynamicWidget::applyModeChange( int mode )
     {
         m_generateButton->setText( tr( "Play" ) );
         m_genNumber->hide();
-        
-        connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), this, SLOT( newTrackLoading() ) );
     } else if( mode == Static ) {
         m_generateButton->setText( tr( "Generate" ) );
         m_genNumber->show();
         if( m_headerLayout->indexOf( m_genNumber ) == -1 )
             m_headerLayout->insertWidget( 4, m_genNumber );
-        
-        disconnect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), this, SLOT( newTrackLoading() ) );
     }
 }