diff --git a/HISTORY b/HISTORY
index d6a38df7..c2e39042 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3717,7 +3717,7 @@ Video Disk Recorder Revision History
   functions to avoid problems on platforms that don't provide these (thanks to
   David Woodhouse for his help).
 
-2005-08-26: Version 1.3.31
+2005-08-27: Version 1.3.31
 
 - Added missing German OSD texts for 'Audio language'.
 - The Setup/CICAM menu now only contains the devices that actually have a CI and
@@ -3730,3 +3730,5 @@ Video Disk Recorder Revision History
 - Fixed the EPG scan, so that it doesn't use the primary device if that is
   currently in Transfer-Mode from itself (thanks to Marcus Hilbrich for a bug
   report that lead to this).
+- Removed the TUNER_LOCK_TIMEOUT in cDevice::AttachReceiver() since it caused more
+  trouble than it fixed.
diff --git a/device.c b/device.c
index 2f614988..23808030 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 1.106 2005/08/21 08:56:49 kls Exp $
+ * $Id: device.c 1.107 2005/08/27 09:01:09 kls Exp $
  */
 
 #include "device.h"
@@ -139,7 +139,6 @@ int cPesAssembler::PacketSize(const uchar *data)
 
 // The default priority for non-primary devices:
 #define DEFAULTPRIORITY  -1
-#define TUNER_LOCK_TIMEOUT 5000 // ms
 
 int cDevice::numDevices = 0;
 int cDevice::useDevice = 0;
@@ -1186,10 +1185,6 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
      return false;
   if (Receiver->device == this)
      return true;
-  if (!HasLock(TUNER_LOCK_TIMEOUT)) {
-     esyslog("ERROR: device %d has no lock, can't attach receiver!", CardIndex() + 1);
-     return false;
-     }
   cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (!receiver[i]) {