diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 110a6e700..548a58855 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -645,6 +645,9 @@ bool CZapit::StartPip(const t_channel_id channel_id)
 	if (pipDemux && (pipDemux->getUnit() != dnum)) {
 		pipDecoder->SetDemux(NULL);
 		delete pipDemux;
+		pipDemux = NULL;
+	}
+	if (!pipDemux) {
 		pipDemux = new cDemux(dnum);
 		pipDemux->Open(DMX_PIP_CHANNEL);
 		pipDecoder->SetDemux(pipDemux);
@@ -2264,8 +2267,6 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 #ifdef ENABLE_PIP
 	/* FIXME until proper demux management */
 	int dnum = 1;
-	if (CFEManager::getInstance()->getFrontendCount() < MAX_DMX_UNITS)
-		dnum = PIP_DEMUX;
 #endif
 #ifdef BOXMODEL_APOLLO
 	videoDecoder = cVideo::GetDecoder(0);