diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp
index 5c41da4c3..56fc0045a 100644
--- a/src/zapit/src/capmt.cpp
+++ b/src/zapit/src/capmt.cpp
@@ -285,9 +285,8 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 			mode, start ? "START" : "STOP", source, oldmask, newmask, force_update, rmode);
 
 	//INFO("source %d old mask %d new mask %d force update %s", source, oldmask, newmask, force_update ? "yes" : "no");
-
-	/* stop decoding if record stops unless it's the live channel. TODO:PIP? */
 #if ! HAVE_COOL_HARDWARE
+	/* stop decoding if record stops unless it's the live channel. TODO:PIP? */
 	/* all the modes: RECORD, STREAM, PIP except PLAY now stopping here !! */
 	if (mode && start == false && source != cDemux::GetSource(0)) {
 		INFO("MODE not PLAY:(%d) start=false, src %d getsrc %d", mode, source, cDemux::GetSource(0));
@@ -300,12 +299,6 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 			channel_map.erase(channel_id);
 		}
 	}
-#else
-	if (mode == RECORD && start == false && source != cDemux::GetSource(0)) {
-		INFO("MODE!=record(%d) start=false, src %d getsrc %d", mode, source, cDemux::GetSource(0));
-		cam->sendMessage(NULL, 0, false);
-		cam->sendCaPmt(channel->getChannelID(), NULL, 0, CA_SLOT_TYPE_ALL);
-	}
 #endif
 
 	if((oldmask != newmask) || force_update) {