diff --git a/src/nhttpd/doc/nhttpd_controlapi.html b/src/nhttpd/doc/nhttpd_controlapi.html
index 7eae99bb2..89adf2763 100644
--- a/src/nhttpd/doc/nhttpd_controlapi.html
+++ b/src/nhttpd/doc/nhttpd_controlapi.html
@@ -797,6 +797,20 @@ ok<br>
 &gt;&gt;&gt;http://dbox/control/setmode?record=stop<br>
 ok<br>
 </div>
+<br>
+<b>Parameter:</b> subchannel=&lt;channel_id&gt; (64 bit, hexidecimal value)<br>
+<b>Rueckgabe:</b><br>
+<br>
+Zappt auf den angegebenen Unterkanal.<br>
+Als Rueckgabe ist im Erfolgsfall ok zu erwarten.<br>
+<br>
+<b>Rueckgabe-Format:</b> ok / error<br>
+<div class="example">
+Beispiel:<br>
+<br>
+&gt;&gt;&gt;http://dbox/control/zapto?subchannel=1008500d4<br>
+ok <br>
+</div>
 
 <!-- ----------------------------------------------------------- -->
 <div class="title1"><a name="getmode"></a>8. Radio/TV Mode Abfrage</div>
diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index 99971d5ef..9b2dd8171 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -1653,7 +1653,9 @@ void CControlAPI::ZaptoCGI(CyhookHandler *hh)
 			CSectionsdClient::LinkageDescriptorList desc;
 			CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
 			CEitManager::getInstance()->getCurrentNextServiceKey(current_channel, currentNextInfo);
-			if (CEitManager::getInstance()->getLinkageDescriptorsUniqueKey(currentNextInfo.current_uniqueKey,desc))
+
+			if (currentNextInfo.flags & CSectionsdClient::epgflags::current_has_linkagedescriptors &&
+			    CEitManager::getInstance()->getLinkageDescriptorsUniqueKey(currentNextInfo.current_uniqueKey, desc))
 			{
 				CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(current_channel);
 				t_satellite_position satellitePosition = channel->getSatellitePosition();
@@ -1669,6 +1671,19 @@ void CControlAPI::ZaptoCGI(CyhookHandler *hh)
 				}
 			}
 		}
+		else if (!hh->ParamList["subchannel"].empty())
+		{
+			t_channel_id current_channel = NeutrinoAPI->Zapit->getCurrentServiceID();
+			CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
+			CEitManager::getInstance()->getCurrentNextServiceKey(current_channel, currentNextInfo);
+			if (currentNextInfo.flags & CSectionsdClient::epgflags::current_has_linkagedescriptors)
+			{
+				NeutrinoAPI->ZapToSubService(hh->ParamList["subchannel"].c_str());
+				hh->SendOk();
+			}
+			else
+				hh->SendError();
+		}
 		else if (hh->ParamList["name"] != "")
 		{
 			t_channel_id channel_id;