diff --git a/main.py b/main.py
index 781d643..c855d84 100644
--- a/main.py
+++ b/main.py
@@ -386,8 +386,8 @@ def room_close_cb(data, buffer):
 def matrix_unload_cb():
     matrix_config_free(matrix.globals.CONFIG)
 
-    for server in SERVERS.values():
-        server.store_olm()
+    # for server in SERVERS.values():
+    #     server.store_olm()
 
     W.prnt("", "unloading")
     return W.WEECHAT_RC_OK
diff --git a/matrix/server.py b/matrix/server.py
index 0c28206..642baac 100644
--- a/matrix/server.py
+++ b/matrix/server.py
@@ -329,7 +329,7 @@ class MatrixServer:
 
         self.send_buffer = b""
         self.current_message = None
-        self.reset_parser()
+        self.client.disconnect()
 
         self.lag = 0
         W.bar_item_update("lag")