diff --git a/src/java/org/jivesoftware/multiplexer/net/http/HttpSessionManager.java b/src/java/org/jivesoftware/multiplexer/net/http/HttpSessionManager.java
index d186b6c..7f4a33c 100644
--- a/src/java/org/jivesoftware/multiplexer/net/http/HttpSessionManager.java
+++ b/src/java/org/jivesoftware/multiplexer/net/http/HttpSessionManager.java
@@ -229,6 +229,7 @@
 
         public void run() {
             session.close();
+            timer.sessionMap.remove(session.getStreamID());
         }
     }
 }