diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 05076531a..4c49463b9 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1144,14 +1144,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	}
 }
 
-/**************************************************************************************
-*          CNeutrinoApp -  firstChannel, get the initial channel                      *
-**************************************************************************************/
-void CNeutrinoApp::firstChannel()
-{
-	g_Zapit->getLastChannel(firstchannel.channel_id, firstchannel.mode);
-}
-
 /**************************************************************************************
 *          CNeutrinoApp -  channelsInit, get the Channellist from daemon              *
 **************************************************************************************/
@@ -3135,10 +3127,10 @@ void CNeutrinoApp::tvMode( bool rezap )
 	g_RemoteControl->tvMode();
 	SetChannelMode(g_settings.channel_mode);
 	if( rezap ) {
-		firstChannel();
+		t_channel_id last_chid = CZapit::getInstance()->GetLastTVChannel();
 		channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */
-		if(CServiceManager::getInstance()->FindChannel(firstchannel.channel_id))
-			channelList->zapTo_ChannelID( firstchannel.channel_id );
+		if(CServiceManager::getInstance()->FindChannel(last_chid))
+			channelList->zapTo_ChannelID(last_chid);
 		else
 			channelList->zapTo(0);
 	}
@@ -3342,10 +3334,10 @@ void CNeutrinoApp::radioMode( bool rezap)
 	g_RemoteControl->radioMode();
 	SetChannelMode(g_settings.channel_mode_radio);
 	if( rezap ) {
-		firstChannel();
+		t_channel_id last_chid = CZapit::getInstance()->GetLastRADIOChannel();
 		channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */
-		if(CServiceManager::getInstance()->FindChannel(firstchannel.channel_id))
-			channelList->zapTo_ChannelID( firstchannel.channel_id );
+		if(CServiceManager::getInstance()->FindChannel(last_chid))
+			channelList->zapTo_ChannelID(last_chid);
 		else
 			channelList->zapTo(0);
 	}
diff --git a/src/neutrino.h b/src/neutrino.h
index 03ed5cfe0..370c1d97f 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -116,7 +116,6 @@ private:
 	int				lastChannelMode;
 	struct timeval                  standby_pressed_at;
 
-	CZapitClient::responseGetLastChannel    firstchannel;
 	st_rmsg				sendmessage;
 
 	int				current_muted;
@@ -129,7 +128,6 @@ private:
 	CIPChangeNotifier		*MyIPChanger;
 
 	void SDT_ReloadChannels();
-	void firstChannel();
 	void setupNetwork( bool force= false );
 	void setupNFS();