diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 50a9a910a..4e9efb3d6 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -231,6 +231,7 @@ CNeutrinoApp::CNeutrinoApp()
 	SetupFrameBuffer();
 
 	mode 			= mode_unknown;
+	lastMode		= mode_unknown;
 	channelList		= NULL;
 	TVchannelList		= NULL;
 	RADIOchannelList	= NULL;
@@ -1780,6 +1781,7 @@ void CNeutrinoApp::InitZapper()
 	int tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV;
 	lastChannelMode = tvmode ? g_settings.channel_mode : g_settings.channel_mode_radio;
 	mode = tvmode ? mode_tv : mode_radio;
+	lastMode = mode;
 
 	SDTreloadChannels = false;
 	channelsInit();
@@ -3321,6 +3323,10 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
 			if(mode != mode_standby)
 				standbyMode( true );
 		}
+		if((data & mode_mask)== mode_upnp) {
+			lastMode=mode;
+			mode=mode_upnp;
+		}
 		if((data & mode_mask)== mode_audio) {
 			lastMode=mode;
 			mode=mode_audio;