diff --git a/matrix/server.py b/matrix/server.py
index 53a9ffe..622c5cc 100644
--- a/matrix/server.py
+++ b/matrix/server.py
@@ -337,6 +337,10 @@ class MatrixServer:
         self.send_queue.clear()
         self.receive_queue.clear()
 
+        self.send_buffer = b""
+        self.current_message = None
+        self.reset_parser()
+
         self.lag = 0
         W.bar_item_update("lag")
         self.reconnect_delay = 0