diff --git a/HISTORY b/HISTORY
index 51318f3c..b5352c2e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3373,3 +3373,8 @@ Video Disk Recorder Revision History
   residual data in replay and Transfer Mode (thanks to Werner Fink for pointing this
   out).
 - Added MPEG1 replay capability to cPesAssembler (thanks to Stefan Huelswitt).
+
+2005-02-08: Version 1.3.21
+
+- Fixed cDvbDevice::SetAudioTrackDevice() to avoid a blank screen after switching
+  back to live mode if a recording is currently active on the primary device.
diff --git a/config.h b/config.h
index 64ebe7cc..7dffe140 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.212 2005/02/05 10:43:22 kls Exp $
+ * $Id: config.h 1.213 2005/02/08 11:22:14 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.20"
-#define VDRVERSNUM   10320  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.21"
+#define VDRVERSNUM   10321  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 269c0a29..2e15ce1d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.117 2005/02/06 12:30:14 kls Exp $
+ * $Id: dvbdevice.c 1.118 2005/02/08 11:20:30 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -866,8 +866,10 @@ void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
   const tTrackId *TrackId = GetTrack(Type);
   if (TrackId && TrackId->id) {
      if (IS_AUDIO_TRACK(Type)) {
-        pidHandles[ptAudio].pid = TrackId->id;
-        SetPid(&pidHandles[ptAudio], ptAudio, true);
+        if (pidHandles[ptAudio].pid) {
+           pidHandles[ptAudio].pid = TrackId->id;
+           SetPid(&pidHandles[ptAudio], ptAudio, true);
+           }
         }
      else if (IS_DOLBY_TRACK(Type)) {
         // Currently this works only in Transfer Mode