diff --git a/HISTORY b/HISTORY
index 036b3745..33d6bb16 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6035,3 +6035,5 @@ Video Disk Recorder Revision History
 
 - cDevice::PlayTs() now syncs on the TS packet sync bytes.
 - Made MAXFRAMESIZE a multiple of TS_SIZE to avoid breaking up TS packets.
+- No longer resetting the patPmtParser in cDevice::PlayTs(), because this
+  caused the selected audio and subtitle tracks to fall back to the default.
diff --git a/device.c b/device.c
index f5a908de..fa6c8aeb 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.14 2009/04/13 11:08:05 kls Exp $
+ * $Id: device.c 2.15 2009/04/13 12:53:09 kls Exp $
  */
 
 #include "device.h"
@@ -1317,7 +1317,6 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
 {
   int Played = 0;
   if (Data == NULL) {
-     patPmtParser.Reset();
      tsToPesVideo.Reset();
      tsToPesAudio.Reset();
      tsToPesSubtitle.Reset();