diff --git a/HISTORY b/HISTORY
index 26b06d81..01d8d1f7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -419,3 +419,5 @@ Video Disk Recorder Revision History
 - Fixed SVDRP commands LSTC and LSTT to make them return an error message if
   no channels or timers are defined.
 - Enhanced 'channels.conf.cable' (thanks to Hans-Peter Raschke).
+- Fixed switching to another channel via the EPG while a recording is being
+  replayed.
diff --git a/dvbapi.c b/dvbapi.c
index 8518d7f9..166b0e06 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.61 2001/02/24 13:13:19 kls Exp $
+ * $Id: dvbapi.c 1.62 2001/03/03 11:36:36 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -2136,6 +2136,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
   if (videoDev >= 0) {
      cThreadLock ThreadLock(siProcessor); // makes sure the siProcessor won't access the vbi-device while switching
      StopTransfer();
+     StopReplay();
      SetPlayMode(videoDev, VID_PLAY_RESET);
      struct frontend front;
      ioctl(videoDev, VIDIOCGFRONTEND, &front);