diff --git a/src/dorkbox/network/connection/Connection.kt b/src/dorkbox/network/connection/Connection.kt
index bb0ab5df..3564142a 100644
--- a/src/dorkbox/network/connection/Connection.kt
+++ b/src/dorkbox/network/connection/Connection.kt
@@ -355,7 +355,7 @@ open class Connection(connectionParameters: ConnectionParams<*>) {
         }
 
         // make sure to save off the RMI objects for session management
-        if (!closeEverything) {
+        if (!closeEverything && endPoint.sessionManager.enabled()) {
             endPoint.sessionManager.onDisconnect(this as SessionConnection)
         }