diff --git a/SMBLibrary/Server/SMBServer.SMB1.cs b/SMBLibrary/Server/SMBServer.SMB1.cs
index 2ac5909..0891c99 100644
--- a/SMBLibrary/Server/SMBServer.SMB1.cs
+++ b/SMBLibrary/Server/SMBServer.SMB1.cs
@@ -97,6 +97,8 @@ namespace SMBLibrary.Server
                 }
                 else if (command is LogoffAndXRequest)
                 {
+                    // FIXME: Remove connected trees that the user has connected to
+                    state.RemoveConnectedUser(header.UID);
                     return new LogoffAndXResponse();
                 }
                 else if (state.IsTreeConnected(header.TID))