diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 6e91df614..4d1fdbba9 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1980,11 +1980,11 @@ void CNeutrinoApp::InitZapper()
 	channelsInit();
 
 	if(firstchannel.mode == 't') {
-		tvMode(false);
+		tvMode(true);
 	} else {
 		g_RCInput->killTimer(g_InfoViewer->lcdUpdateTimer);
 		g_InfoViewer->lcdUpdateTimer = g_RCInput->addTimer( LCD_UPDATE_TIME_RADIO_MODE, false );
-		radioMode(false);
+		radioMode(true);
 	}
 	if(g_settings.cacheTXT)
 		tuxtxt_init();
@@ -3985,6 +3985,10 @@ void CNeutrinoApp::standbyMode( bool bOnOff )
 		g_Zapit->setStandby(false);
 		if(was_record)
 			g_Zapit->startPlayBack();
+		else {
+			channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */
+			channelList->zapTo_ChannelID(live_channel_id);
+		}
 		if(recordingstatus) was_record = 0;
 
 		videoDecoder->Standby(false);
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 7d7364281..d9cacb238 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -404,6 +404,7 @@ printf("[zapit] saving channel, apid %x sub pid %x mode %d volume %d\n", g_curre
                 audio_map[g_current_channel->getChannelID()].volume = audioDecoder->getVolume();
                 audio_map[g_current_channel->getChannelID()].subpid = dvbsub_getpid();
 		tuxtx_subtitle_running(&audio_map[g_current_channel->getChannelID()].ttxpid, &audio_map[g_current_channel->getChannelID()].ttxpage, NULL);
+		firstzap = false;
         }
 
 	if (in_nvod) {
@@ -2087,8 +2088,10 @@ void leaveStandby(void)
 	}
 
 	standby = false;
+#if 0
 	if (g_current_channel)
 		zapit(live_channel_id, current_is_nvod, false, true);
+#endif
 }
 
 unsigned zapTo(const unsigned int bouquet, const unsigned int pchannel)
@@ -2264,7 +2267,7 @@ int zapit_main_thread(void *data)
 	// sleep(1) is ok here. (striper)
 	sleep(1);
 	leaveStandby();
-	firstzap = false;
+	//firstzap = false;
 	stime = time(0);
 	//time_t curtime;
 	pthread_create (&tsdt, NULL, sdt_thread, (void *) NULL);