diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h
index 9be18fe7f..00b8e4da6 100644
--- a/src/zapit/include/zapit/zapit.h
+++ b/src/zapit/include/zapit/zapit.h
@@ -198,7 +198,7 @@ class CZapit : public OpenThreads::Thread
 		void LoadVolumeMap();
 		void SaveChannelPids(CZapitChannel* channel);
 		virtual void ConfigFrontend();
-		bool StopPlayBack(bool send_pmt);
+		bool StopPlayBack(bool send_pmt, bool blank = true);
 		virtual void leaveStandby();
 
 		static CZapit * zapit;
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index f09d76532..9ba547180 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -1617,10 +1617,7 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
 #endif
 
 	case CZapitMessages::CMD_SB_LOCK_PLAYBACK:
-		/* hack. if standby true, dont blank video */
-		standby = true;
-		StopPlayBack(true);
-		standby = false;
+		StopPlayBack(msgBool.truefalse, false);
 		playbackStopForced = true;
 		lock_channel_id = live_channel_id;
 		SendCmdReady(connfd);
@@ -2103,7 +2100,7 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
 	return true;
 }
 
-bool CZapit::StopPlayBack(bool send_pmt)
+bool CZapit::StopPlayBack(bool send_pmt, bool blank)
 {
 	if(send_pmt)
 		CCamManager::getInstance()->Stop(live_channel_id, CCamManager::PLAY);
@@ -2122,7 +2119,7 @@ bool CZapit::StopPlayBack(bool send_pmt)
 	audioDecoder->Stop();
 
 	/* hack. if standby, dont blank video -> for paused timeshift */
-	videoDecoder->Stop(standby ? false : true);
+	videoDecoder->Stop(standby ? false : blank);
 #ifdef USE_VBI
 	videoDecoder->StopVBI();
 #endif