diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp
index af1060703fe..8624497d42f 100644
--- a/src/tracks/SampleTrack.cpp
+++ b/src/tracks/SampleTrack.cpp
@@ -71,6 +71,8 @@ SampleTCO::SampleTCO( Track * _track ) :
 	{
 		connect( timeLine, SIGNAL( positionMarkerMoved() ), this, SLOT( playbackPositionChanged() ) );
 	}
+	//playbutton clicked or space key / on Export Song set isPlaying to false
+	connect( Engine::getSong(), SIGNAL( playbackStateChanged() ), this, SLOT( playbackPositionChanged() ) );
 	//care about loops
 	connect( Engine::getSong(), SIGNAL( updateSampleTracks() ), this, SLOT( playbackPositionChanged() ) );
 	//care about mute TCOs
@@ -79,11 +81,6 @@ SampleTCO::SampleTCO( Track * _track ) :
 	connect( getTrack()->getMutedModel(), SIGNAL( dataChanged() ),this, SLOT( playbackPositionChanged() ) );
 	//care about TCO position
 	connect( this, SIGNAL( positionChanged() ), this, SLOT( updateTrackTcos() ) );
-	//playbutton clicked or space key
-	if( gui )
-	{
-		connect( gui->songEditor(), SIGNAL( playTriggered() ), this, SLOT( playbackPositionChanged() ) );
-	}
 
 	switch( getTrack()->trackContainer()->type() )
 	{