diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0926d4c0..5d23c9b0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2445,6 +2445,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for implementing anti-aliasing for cPixmap::DrawSlope() and cPixmap::DrawEllipse()
  for reporting an unnecessary double call to Display() in cMenuRecording::RefreshRecording()
  for reporting too much memory being allocated in the cImage constructors
+ for reporting a problem with the call to EpgHandlers.EndSegmentTransfer()
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
diff --git a/HISTORY b/HISTORY
index 0f9c6d53..9c58aef9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9579,3 +9579,5 @@ Video Disk Recorder Revision History
 
 - Fixed a possible crash in the Schedule menu, in case Setup.EPGLinger is 0.
 - Fixed cTsPayload::AtPayloadStart() to ignore TS packets from other PIDs.
+- Fixed unlocking vs. call to EpgHandlers.EndSegmentTransfer() (reported by Christoph
+  Haubrich).
diff --git a/eit.c b/eit.c
index 9c3f6f61..22d17ea3 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 4.11 2020/11/28 21:45:05 kls Exp $
+ * $Id: eit.c 4.11.1.1 2021/12/27 11:04:03 kls Exp $
  */
 
 #include "eit.h"
@@ -361,9 +361,9 @@ cEIT::cEIT(cSectionSyncerHash &SectionSyncerHash, int Source, u_char Tid, const
      EpgHandlers.DropOutdated(pSchedule, SegmentStart, SegmentEnd, Tid, getVersionNumber());
      pSchedule->SetModified();
      }
+  EpgHandlers.EndSegmentTransfer(Modified);
   SchedulesStateKey.Remove(Modified);
   ChannelsStateKey.Remove(ChannelsModified);
-  EpgHandlers.EndSegmentTransfer(Modified);
 }
 
 // --- cTDT ------------------------------------------------------------------