diff --git a/crates/server/src/rtmp.rs b/crates/server/src/rtmp.rs
index c15dc48..3247580 100644
--- a/crates/server/src/rtmp.rs
+++ b/crates/server/src/rtmp.rs
@@ -163,6 +163,9 @@ impl Rtmp {
                         }
                         Err(_) => {
                             warn!("RTMP timed out (15 sec no packets) id: {:?}", stream_id);
+                            if let Some(id) = current_stream_key_id {
+                                cleanup(id).await;
+                            }
                             return;
                         }
                     };