diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 358c00f08..9fc7217f4 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2412,6 +2412,10 @@ int CNeutrinoApp::run(int argc, char **argv)
 	audioDecoder->EnableAnalogOut(g_settings.analog_out ? true : false);
 
 	videoDecoder->SetDBDR(g_settings.video_dbdr);
+	videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1);
+	videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1);
+	videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode);
+
 	audioSetupNotifier->changeNotify(LOCALE_AUDIOMENU_AVSYNC, NULL);
 
 	if(display_language_selection)
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index ef3e388d1..5186f9d3b 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -437,18 +437,16 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void *)
 	{
 		cec1->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF);
 		cec2->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF);
-		videoDecoder->SetCEC((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode);
+		videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode);
 	}
-#if 0
 	else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC_STANDBY))
 	{
-		videoDecoder->enableCECStandby(g_settings.hdmi_cec_standby);
+		videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1);
 	}
 	else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC_VIEW_ON))
 	{
-		videoDecoder->enableCECView(g_settings.hdmi_cec_view_on);
+		videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1);
 	}
-#endif
 	else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_DBDR))
 	{
 		videoDecoder->SetDBDR(g_settings.video_dbdr);
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index f9443587f..059d78522 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2106,6 +2106,7 @@ int zapit_main_thread(void *data)
 	pcrDemux->Open(DMX_PCR_ONLY_CHANNEL, videoDemux->getBuffer());
 
 	videoDecoder = new cVideo(2, videoDemux->getChannel(), videoDemux->getBuffer());//PAL
+	videoDecoder->Standby(false);
 	videoDecoder->SetVideoSystem(video_mode);
 	//videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer());//PAL