diff --git a/src/nhttpd/doc/nhttpd_controlapi.html b/src/nhttpd/doc/nhttpd_controlapi.html
index cb8208cc5..5ddcc8e26 100644
--- a/src/nhttpd/doc/nhttpd_controlapi.html
+++ b/src/nhttpd/doc/nhttpd_controlapi.html
@@ -48,7 +48,7 @@
 		<td><a href="http://box_ip/control/setmode">http://box_ip/control/setmode</a></td>
 	</tr>
 	<tr>
-		<td><a href="#getmode">Radio/TV Mode Abfrage</a></td>
+		<td><a href="#getmode">Neutrino Mode Abfrage</a></td>
 		<td><a href="http://box_ip/control/getmode">http://box_ip/control/getmode</td>
 	</tr>
 	<tr>
@@ -952,13 +952,14 @@ ok<br>
 </div>
 
 <!-- ----------------------------------------------------------- -->
-<div class="title1"><a name="getmode"></a><b>Radio/TV Mode Abfrage</b></div>
+<div class="title1"><a name="getmode"></a><b>Neutrino Mode Abfrage</b></div>
 <div class="URL">Handler: http://box_ip/control/getmode</div>
 <br>
-<b>Parameter:</b> <br>
-<b>R&uuml;ckgabe:</b> &quot;tv&quot;, &quot;radio&quot;, &quot;unkown&quot;<br>
+<b>Parameter:</b> keine<br>
+<b>R&uuml;ckgabe:</b> &quot;tv&quot;, &quot;radio&quot;, &quot;scart&quot;, &quot;standby&quot;, &quot;audio&quot;,<br>
+&quot;pic&quot;, &quot;ts&quot;, &quot;webtv&quot;, &quot;upnp&quot;, &quot;unknown&quot;<br>
 <br>
-Es wird der aktuelle mode zur&uuml;ckgegeben tv / radio / unknown (shouldn't happen)<br>
+Es wird der aktuelle Modus der Box zur&uuml;ckgegeben<br>
 <div class="example">
 Beispiel:<br>
 <br>
@@ -966,6 +967,17 @@ Beispiel:<br>
 tv<br>
 <br>
 </div>
+<b>Parameter:</b> channelsmode<br>
+<b>R&uuml;ckgabe:</b> &quot;tv&quot;, &quot;radio&quot;, &quot;unknown&quot;<br>
+<br>
+Es wird der eingestellte Kanalmodus der Box zur&uuml;ckgegeben<br>
+<div class="example">
+Beispiel:<br>
+<br>
+&gt;&gt;&gt;http://box_ip/control/getmode?channelmode<br>
+radio<br>
+<br>
+</div>
 
 <!-- ----------------------------------------------------------- -->
 <div class="title1"><a name="getdate"></a><b>Datum von der Box abfragen</b></div>
diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp
index f9ffc3eff..60cb7c53e 100644
--- a/src/nhttpd/tuxboxapi/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/controlapi.cpp
@@ -392,36 +392,56 @@ void CControlAPI::SetModeCGI(CyhookHandler *hh)
 void CControlAPI::GetModeCGI(CyhookHandler *hh)
 {
 	hh->outStart();
-
 	std::string result = "";
-	int mode = CNeutrinoApp::getInstance()->getMode();
-	if (mode == NeutrinoMessages::mode_tv)
-		result = "tv";
-	else if (mode == NeutrinoMessages::mode_radio)
-		result = "radio";
-	else if (mode == NeutrinoMessages::mode_scart)
-		result = "scart";
-	else if (mode == NeutrinoMessages::mode_standby)
-		result = "standby";
-	else if (mode == NeutrinoMessages::mode_audio)
-		result = "audio";
-	else if (mode == NeutrinoMessages::mode_pic)
-		result = "pic";
-	else if (mode == NeutrinoMessages::mode_ts)
-		result = "ts";
-	else if (mode == NeutrinoMessages::mode_webtv)
-		result = "webtv";
-	else if (mode == NeutrinoMessages::mode_upnp)
-		result = "upnp";
-	else
-		result = "unknown";
+	std::string key = "mode";
 
-	if (hh->getOutType() != plain)
+	if (hh->ParamList_exist("channelsmode") && hh->ParamList["channelsmode"] != "false")
 	{
-		result = hh->outPair("mode", result, false);
-		result = hh->outObject("getmode", result);
+		key = "channelsmode";
+		int mode = NeutrinoAPI->Zapit->getMode();
+		if (mode == CZapitClient::MODE_TV)
+			result = "tv";
+		else if (mode == CZapitClient::MODE_RADIO)
+			result = "radio";
+		else
+			result = "unknown";
 	}
-	hh->SendResult(result);
+	else
+	{
+		int mode = CNeutrinoApp::getInstance()->getMode();
+		if (mode == NeutrinoMessages::mode_tv)
+			result = "tv";
+		else if (mode == NeutrinoMessages::mode_radio)
+			result = "radio";
+		else if (mode == NeutrinoMessages::mode_scart)
+			result = "scart";
+		else if (mode == NeutrinoMessages::mode_standby)
+			result = "standby";
+		else if (mode == NeutrinoMessages::mode_audio)
+			result = "audio";
+		else if (mode == NeutrinoMessages::mode_pic)
+			result = "pic";
+		else if (mode == NeutrinoMessages::mode_ts)
+			result = "ts";
+		else if (mode == NeutrinoMessages::mode_webtv)
+			result = "webtv";
+		else if (mode == NeutrinoMessages::mode_upnp)
+			result = "upnp";
+		else
+			result = "unknown";
+	}
+
+	if (!result.empty())
+	{
+		if (hh->getOutType() != plain)
+		{
+			result = hh->outPair(key, result, false);
+			result = hh->outObject("getmode", result);
+		}
+		hh->SendResult(result);
+	}
+	else
+		hh->SendError();
 }
 
 //-----------------------------------------------------------------------------