diff --git a/config/nginx-rtmp/nginx.conf b/config/nginx-rtmp/nginx.conf
index 2d55729..99b84ab 100644
--- a/config/nginx-rtmp/nginx.conf
+++ b/config/nginx-rtmp/nginx.conf
@@ -53,6 +53,10 @@ http {
 
 rtmp {
         access_log /dev/stdout;
+
+        # this should fix the hangs when the stream dies
+        drop_idle_publisher 15s;
+        timeout 15s;
         server {
                 listen 1935;
                 chunk_size 4096;