diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp
index 284663c89..0134b523c 100644
--- a/src/nhttpd/tuxboxapi/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/controlapi.cpp
@@ -1478,8 +1478,6 @@ std::string CControlAPI::channelEPGformated(CyhookHandler *hh, int bouquetnr, t_
 {
 	std::string result = "";
 	std::string channelData = "";
-	CChannelEventList eList;
-	CEitManager::getInstance()->getEventsServiceKey(channel_id, eList);
 	channelData += hh->outPair("channel_name", hh->outValue(NeutrinoAPI->GetServiceName(channel_id)), true);
 	channelData += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id), true);
 	channelData += hh->outPair("channel_short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id & 0xFFFFFFFFFFFFULL), (bouquetnr > -1));
@@ -1490,6 +1488,15 @@ std::string CControlAPI::channelEPGformated(CyhookHandler *hh, int bouquetnr, t_
 	int i = 0;
 	CChannelEventList::iterator eventIterator;
 	bool isFirstLine = true;
+
+	t_channel_id epg_id = channel_id;
+	CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(channel_id);
+	if (ch)
+		epg_id = ch->getEpgID();
+
+	CChannelEventList eList;
+	CEitManager::getInstance()->getEventsServiceKey(epg_id, eList);
+
 	for (eventIterator = eList.begin(); eventIterator != eList.end(); ++eventIterator, i++) {
 		if ((max != -1 && i >= max) || (stoptime != -1 && eventIterator->startTime >= stoptime))
 			break;
diff --git a/src/nhttpd/tuxboxapi/neutrinoapi.cpp b/src/nhttpd/tuxboxapi/neutrinoapi.cpp
index 82e2100cd..f0a30f604 100644
--- a/src/nhttpd/tuxboxapi/neutrinoapi.cpp
+++ b/src/nhttpd/tuxboxapi/neutrinoapi.cpp
@@ -295,7 +295,13 @@ void CNeutrinoAPI::GetChannelEvent(t_channel_id channel_id, CChannelEvent &event
 {
 	OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(pmutex);
 	event.eventID = 0;
-	CChannelEvent * evt = ChannelListEvents[channel_id];
+
+	t_channel_id epg_id = channel_id;
+	CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(channel_id);
+	if (ch)
+		epg_id = ch->getEpgID();
+
+	CChannelEvent * evt = ChannelListEvents[epg_id];
 	if (evt)
 		event = *evt;
 }
diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
index 5066e5698..266363e22 100644
--- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -524,7 +524,9 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
 		else if (event.eventID)
 		{
 			bool has_current_next = true;
-			CEitManager::getInstance()->getCurrentNextServiceKey(channel->getChannelID(), currentNextInfo);
+			t_channel_id epg_id = channel->getChannelID();
+			epg_id = channel->getEpgID();
+			CEitManager::getInstance()->getCurrentNextServiceKey(epg_id, currentNextInfo);
 			timestr = timeString(event.startTime);
 
 			CShortEPGData epg;