diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp
index 974bf9690..d151f8229 100644
--- a/src/eitd/sectionsd.cpp
+++ b/src/eitd/sectionsd.cpp
@@ -46,6 +46,7 @@
 #include <eventserver.h>
 #include <driver/abstime.h>
 #include <system/helpers.h>
+#include <OpenThreads/ScopedLock>
 
 #include "eitd.h"
 #include "sectionsd.h"
@@ -125,6 +126,7 @@ static CEventServer *eventServer;
 /*static*/ pthread_rwlock_t eventsLock = PTHREAD_RWLOCK_INITIALIZER; // Unsere (fast-)mutex, damit nicht gleichzeitig in die Menge events geschrieben und gelesen wird
 static pthread_rwlock_t servicesLock = PTHREAD_RWLOCK_INITIALIZER; // Unsere (fast-)mutex, damit nicht gleichzeitig in die Menge services geschrieben und gelesen wird
 static pthread_rwlock_t messagingLock = PTHREAD_RWLOCK_INITIALIZER;
+OpenThreads::Mutex filter_mutex;
 
 static CTimeThread threadTIME;
 static CEitThread threadEIT;
@@ -233,7 +235,9 @@ static bool deleteEvent(const event_id_t uniqueKey)
 /* if cn == true (if called by cnThread), then myCurrentEvent and myNextEvent is updated, too */
 /*static*/ void addEvent(const SIevent &evt, const time_t zeit, bool cn = false)
 {
+	filter_mutex.lock();
 	bool EPG_filtered = checkEPGFilter(evt.original_network_id, evt.transport_stream_id, evt.service_id);
+	filter_mutex.unlock();
 
 	/* more readable in "plain english":
 	   if current/next are not to be filtered and table_id is current/next -> continue
@@ -2149,6 +2153,8 @@ bool CEitManager::Start()
 		config.epg_cache, config.epg_extendedcache, config.epg_max_events, config.epg_old_events);
 	printf("[sectionsd] NTP: %s, server %s, command %s\n", ntpenable ? "enabled" : "disabled", ntpserver.c_str(), ntp_system_cmd_prefix.c_str());
 
+	readEPGFilter();
+
 	if (!sectionsd_server.prepare(SECTIONSD_UDS_NAME)) {
 		fprintf(stderr, "[sectionsd] failed to prepare basic server\n");
 		return false;
@@ -2193,7 +2199,6 @@ printf("SIevent size: %d\n", (int)sizeof(SIevent));
 
 	tzset(); // TZ auswerten
 
-	readEPGFilter();
 	readDVBTimeFilter();
 	readEncodingFile();
 
@@ -2884,3 +2889,18 @@ unsigned CEitManager::getEventsCount()
 	unlockEvents();
 	return anzEvents;
 }
+
+void CEitManager::addChannelFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid)
+{
+	OpenThreads::ScopedLock<OpenThreads::Mutex> slock(filter_mutex);
+	epg_filter_except_current_next = true;
+	epg_filter_is_whitelist = true;
+	addEPGFilter(onid, tsid, sid);
+}
+
+void CEitManager::clearChannelFilters()
+{
+	OpenThreads::ScopedLock<OpenThreads::Mutex> slock(filter_mutex);
+	clearEPGFilter();
+	epg_filter_is_whitelist = false;
+}
diff --git a/src/eitd/sectionsd.h b/src/eitd/sectionsd.h
index fd81bc4f7..491a3963a 100644
--- a/src/eitd/sectionsd.h
+++ b/src/eitd/sectionsd.h
@@ -66,6 +66,8 @@ class CEitManager : public OpenThreads::Thread, public OpenThreads::Mutex
 		bool getLinkageDescriptorsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::LinkageDescriptorList& descriptors);
 		bool getNVODTimesServiceKey(const t_channel_id uniqueServiceKey, CSectionsdClient::NVODTimesList& nvod_list);
 		void setLanguages(const std::vector<std::string>& newLanguages);
+		void addChannelFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid);
+		void clearChannelFilters(void);
 		unsigned getEventsCount();
 };
 
diff --git a/src/eitd/xmlutil.cpp b/src/eitd/xmlutil.cpp
index 6bd6794f3..1d624523c 100644
--- a/src/eitd/xmlutil.cpp
+++ b/src/eitd/xmlutil.cpp
@@ -126,7 +126,7 @@ bool checkNoDVBTimelist(t_channel_id channel_id)
 	return false;
 }
 
-static void addEPGFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid)
+void addEPGFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid)
 {
 	if (!checkEPGFilter(onid, tsid, sid))
 	{
@@ -140,6 +140,18 @@ static void addEPGFilter(t_original_network_id onid, t_transport_stream_id tsid,
 	}
 }
 
+void clearEPGFilter()
+{
+	EPGFilter *filterptr = CurrentEPGFilter;
+	while (filterptr)
+	{
+		EPGFilter *filternext = filterptr->next;
+		delete filterptr;
+		filterptr = filternext;
+	}
+	CurrentEPGFilter = NULL;
+}
+
 static void addBlacklist(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid)
 {
 	t_channel_id channel_id =
diff --git a/src/eitd/xmlutil.h b/src/eitd/xmlutil.h
index aee7269d5..91380c996 100644
--- a/src/eitd/xmlutil.h
+++ b/src/eitd/xmlutil.h
@@ -42,6 +42,8 @@ void readDVBTimeFilter(void);
 bool checkEPGFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid);
 bool checkBlacklist(t_channel_id channel_id);
 bool checkNoDVBTimelist(t_channel_id channel_id);
+void addEPGFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid);
+void clearEPGFilter();
 
 #endif /* __sectionsd__debug_h__ */