diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp
index 9e81dbd2e..8d4351a37 100644
--- a/src/zapit/src/capmt.cpp
+++ b/src/zapit/src/capmt.cpp
@@ -296,7 +296,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 		cam->sendMessage(NULL, 0, false);
 		/* clean up channel_map with stopped record/stream/pip services NOT live-tv */
 		it = channel_map.find(channel_id);
-		if(it != channel_map.end() && newmask != 0)
+		if(it != channel_map.end() && newmask != 0 && it->second != cam)
 		{
 			delete it->second;
 			channel_map.erase(channel_id);