diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 9d31576ee..cb1bef808 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -2383,7 +2383,7 @@ void CChannelList::paint_events()
 		int current_index = paint_events_index;
 
 		CChannelEventList evtlist;
-		readEvents((*chanlist)[current_index]->getChannelID(), evtlist);
+		readEvents((*chanlist)[current_index]->getEpgID(), evtlist);
 		if (current_index == paint_events_index) {
 			pthread_mutex_lock(&paint_events_mutex);
 			if (current_index == paint_events_index)
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 09cae0993..3c7c0961a 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -1525,7 +1525,7 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist)
 	CMenuWidget * menu_chanlist = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
 
 	//using native callback to ensure stop header clock in parent channellist before paint this menu window
-	if (parent_channellist)
+	if (parent_channellist && parent_channellist->getHeaderObject()->getClockObject())
 		menu_chanlist->OnBeforePaint.connect(sigc::mem_fun(parent_channellist->getHeaderObject()->getClockObject(), &CComponentsFrmClock::block));
 
 	menu_chanlist->enableSaveScreen(true);