diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp
index b4e3bacda..81f1e8646 100644
--- a/src/eitd/sectionsd.cpp
+++ b/src/eitd/sectionsd.cpp
@@ -2306,6 +2306,24 @@ void CEitManager::getEventsServiceKey(t_channel_id serviceUniqueKey, CChannelEve
 	unlockEvents();
 }
 
+/* invalidate current/next events, if current event times expired */
+void CEitManager::checkCurrentNextEvent(void)
+{
+	time_t curtime = time(NULL);
+	writeLockEvents();
+	if (scanning || !myCurrentEvent || myCurrentEvent->times.empty()) {
+		unlockEvents();
+		return;
+	}
+	if ((long)(myCurrentEvent->times.begin()->startzeit + myCurrentEvent->times.begin()->dauer) < (long)curtime) {
+		delete myCurrentEvent;
+		myCurrentEvent = NULL;
+		delete myNextEvent;
+		myNextEvent = NULL;
+	}
+	unlockEvents();
+}
+
 /* send back the current and next event for the channel id passed to it
  * Works like that:
  * - if the currently running program is requested, return myCurrentEvent and myNextEvent,
@@ -2329,6 +2347,8 @@ void CEitManager::getCurrentNextServiceKey(t_channel_id uniqueServiceKey, CSecti
 
 	uniqueServiceKey &= 0xFFFFFFFFFFFFULL;
 
+	checkCurrentNextEvent();
+
 	readLockEvents();
 	/* if the currently running program is requested... */
 	if (uniqueServiceKey == messaging_current_servicekey) {
@@ -2587,6 +2607,7 @@ bool CEitManager::getActualEPGServiceKey(const t_channel_id channel_id, CEPGData
 	dprintf("[commandActualEPGchannelID] Request of current EPG for " PRINTF_CHANNEL_ID_TYPE "\n", channel_id);
 
 	t_channel_id uniqueServiceKey = channel_id & 0xFFFFFFFFFFFFULL;
+	checkCurrentNextEvent();
 	readLockEvents();
 	if (uniqueServiceKey == messaging_current_servicekey) {
 		if (myCurrentEvent) {
diff --git a/src/eitd/sectionsd.h b/src/eitd/sectionsd.h
index 3d3d398c1..fd81bc4f7 100644
--- a/src/eitd/sectionsd.h
+++ b/src/eitd/sectionsd.h
@@ -42,6 +42,7 @@ class CEitManager : public OpenThreads::Thread, public OpenThreads::Mutex
 
 		static OpenThreads::Mutex m;
 		static CEitManager * manager;
+		void checkCurrentNextEvent(void);
 
 		CEitManager();
 		/* main thread function */