diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp
index a09cec1ba..956ce7798 100644
--- a/src/zapit/src/femanager.cpp
+++ b/src/zapit/src/femanager.cpp
@@ -642,7 +642,7 @@ CFrontend * CFEManager::allocateFE(CZapitChannel * channel, bool forrecord)
 		/* FIXME until proper demux management */
 		if (enabled_count < 4) {
 			channel->setPipDemux(PIP_DEMUX);
-			cDemux::SetSource(PIP_DEMUX, frontend->fenumber);
+			//cDemux::SetSource(PIP_DEMUX, frontend->fenumber);
 		}
 		INFO("pip demux: %d", channel->getPipDemux());
 #endif
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 3c4758808..6e7a9750a 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -615,6 +615,7 @@ bool CZapit::StartPip(const t_channel_id channel_id)
 		pipDemux->Open(DMX_PIP_CHANNEL);
 		pipDecoder->SetDemux(pipDemux);
 	}
+	cDemux::SetSource(dnum, pip_fe->getNumber());
 #if 0
 	pipDecoder->SetSyncMode(AVSYNC_DISABLED);
 	pipDemux->SetSyncMode(AVSYNC_DISABLED);