diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp
index 631b5ea24..dddcea460 100644
--- a/src/daemonc/remotecontrol.cpp
+++ b/src/daemonc/remotecontrol.cpp
@@ -542,6 +542,12 @@ void CRemoteControl::processAPIDnames()
 #endif
 	if ( has_unresolved_ctags )
 	{
+		if ( current_EPGid == 0 ){
+			const CSectionsdClient::CurrentNextInfo info_CN = g_InfoViewer->getCurrentNextInfo();
+			if ((info_CN.current_uniqueKey >> 16) == (current_channel_id & 0xFFFFFFFFFFFFULL)){
+				current_EPGid = info_CN.current_uniqueKey;
+			}
+		}
 		if ( current_EPGid != 0 )
 		{
 			CSectionsdClient::ComponentTagList tags;