diff --git a/main.py b/main.py
index e7e6838..fec2737 100644
--- a/main.py
+++ b/main.py
@@ -257,11 +257,6 @@ def receive_cb(server_name, file_descriptor):
 
             server.disconnect()
 
-            # Queue the failed message for resending
-            if server.receive_queue:
-                message = server.receive_queue.popleft()
-                server.send_queue.appendleft(message)
-
             return W.WEECHAT_RC_OK
 
         if not data:
@@ -274,11 +269,6 @@ def receive_cb(server_name, file_descriptor):
                 ("{prefix}matrix: disconnecting from server...").format(
                     prefix=W.prefix("network")))
 
-            # Queue the failed message for resending
-            if server.receive_queue:
-                message = server.receive_queue.popleft()
-                server.send_queue.appendleft(message)
-
             server.disconnect()
             break
 
diff --git a/matrix/server.py b/matrix/server.py
index 2b07a40..53a9ffe 100644
--- a/matrix/server.py
+++ b/matrix/server.py
@@ -334,6 +334,7 @@ class MatrixServer:
         self.socket = None
         self.connected = False
         self.access_token = ""
+        self.send_queue.clear()
         self.receive_queue.clear()
 
         self.lag = 0