diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7ed40ee9..22ea4589 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2454,6 +2454,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  reporting a missing 'const'
  for reporting that the edited recording is not deleted in case of an error
  for reporting missing '0x09=H.265 video, 0x19 = AC4 audio' in vdr.5
+ 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 c1a3031e..827d562c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9737,9 +9737,11 @@ Video Disk Recorder Revision History
 - The Recordings menu now marks recordings with errors with an exclamation mark ('!'),
   and the number of errors (if any) is displayed in the recording's Info menu.
 
-2021-10-16:
+2021-12-11:
 
 - Replaced all umlauts in the example channels.conf with their ae, oe, ue substitutes
   to avoid problems on UTF-8 systems.
 - Added missing '0x09=H.265 video, 0x19 = AC4 audio' to vdr.5 (reported by Christoph
   Haubrich).
+- Fixed unlocking vs. call to EpgHandlers.EndSegmentTransfer() (reported by Christoph
+  Haubrich).
diff --git a/eit.c b/eit.c
index b06a1368..0d685c5e 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 5.3 2021/04/28 20:44:56 kls Exp $
+ * $Id: eit.c 5.4 2021/12/11 20:58:51 kls Exp $
  */
 
 // The various ways in which broadcasters handle (or screw up) their EPG:
@@ -432,9 +432,9 @@ cEIT::cEIT(cEitTablesHash &EitTablesHash, int Source, u_char Tid, const u_char *
         EpgHandlers.DropOutdated(pSchedule, SegmentStart, SegmentEnd, Tid, getVersionNumber());
         }
      }
+  EpgHandlers.EndSegmentTransfer(Modified);
   SchedulesStateKey.Remove(Modified);
   ChannelsStateKey.Remove(ChannelsModified);
-  EpgHandlers.EndSegmentTransfer(Modified);
 }
 
 // --- cTDT ------------------------------------------------------------------