diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index e8649d22c..d419029d4 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -1262,7 +1262,9 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force)
 		}
 
 		selected_chid = channel->getChannelID();
-		g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), channel->number, (channel->Locked() == g_settings.parentallock_defaultlocked));
+		bool startvideo = (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_NEVER) ||
+				  (channel->Locked() == g_settings.parentallock_defaultlocked);
+		g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), channel->number, startvideo);
 		CNeutrinoApp::getInstance()->adjustToChannelID(channel->getChannelID());
 	}
 	if(new_zap_mode != 2 /* not active */) {