diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 04487a63..2c713a2d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3277,6 +3277,7 @@ Matthias Senzel <matthias.senzel@t-online.de>
  various Now and Schedule menus for different channels
  for the "jumpingseconds" patch
  for reporting a bug in drawing very long menu titles in the LCARS skin
+ for reporting and helping to debug a crash when stopping VDR
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
diff --git a/HISTORY b/HISTORY
index 1dced2b7..933b815b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9162,7 +9162,9 @@ Video Disk Recorder Revision History
   a subdirectory.
 - SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details).
 
-2017-07-24: Version 2.3.9
+2017-08-31: Version 2.3.9
 
 - Updated the Italian OSD texts (thanks to Diego Pierotto).
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed a possible crash when stopping VDR (thanks to Matthias Senzel for reporting and
+  helping to debug this one).
diff --git a/device.c b/device.c
index 3c676922..cb2e05ea 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 4.23 2017/05/30 11:06:11 kls Exp $
+ * $Id: device.c 4.24 2017/08/31 11:34:54 kls Exp $
  */
 
 #include "device.h"
@@ -1823,7 +1823,7 @@ void cDevice::Detach(cReceiver *Receiver)
         }
      }
   if (!receiversLeft)
-     Cancel(-1);
+     Cancel(3);
 }
 
 void cDevice::DetachAll(int Pid)