diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index fff0e4624..572961e7f 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1820,10 +1820,7 @@ 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;
 
 	g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
 #if HAVE_TRIPLEDRAGON