diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index 6032d376a..61fe5c9c4 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -1277,9 +1277,7 @@ void CRecordManager::StartTimeshift()
 		if(res)
 		{
 			CMoviePlayerGui::getInstance().exec(NULL, tmode);
-			if(g_settings.temp_timeshift)
-				Stop(live_channel_id);
-			else if (!(g_settings.auto_timeshift && autoshift))
+			if(g_settings.temp_timeshift && !g_settings.auto_timeshift && autoshift)
 				ShowMenu();
 		}
 	}