diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index ec32d4e63..fff0e4624 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1819,6 +1819,12 @@ TIMER_START();
 
 	cpuFreq = new cCpuFreqManager();
 	cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
+
+	g_info.delivery_system = DVB_S;
+	if(CFEManager::getInstance()->getLiveFE() != NULL){
+		g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
+	}
+
 	g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
 #if HAVE_TRIPLEDRAGON
 	/* only SAT-hd1 before rev 8 has fan, rev 1 is TD (compat hack) */
diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp
index 4255a35bf..0aa479238 100644
--- a/src/zapit/src/getservices.cpp
+++ b/src/zapit/src/getservices.cpp
@@ -591,6 +591,9 @@ bool CServiceManager::InitSatPosition(t_satellite_position position, char * name
 
 bool CServiceManager::LoadServices(bool only_current)
 {
+	if(CFEManager::getInstance()->getLiveFE() == NULL)
+		return false;
+
 	xmlDocPtr parser;
 	static bool satcleared = 0;//clear only once, because menu is static
 	service_count = 0;