diff --git a/main.py b/main.py
index 323e572..7230229 100644
--- a/main.py
+++ b/main.py
@@ -314,6 +314,7 @@ def finalize_connection(server):
     server.fd_hook = hook
     server.connected = True
     server.connecting = False
+    server.reconnect_delay = 0
 
     negotiated_protocol = server.socket.selected_alpn_protocol()
 
diff --git a/matrix/server.py b/matrix/server.py
index eeb12b1..c53d623 100644
--- a/matrix/server.py
+++ b/matrix/server.py
@@ -443,7 +443,6 @@ class MatrixServer(object):
 
         self.lag = 0
         W.bar_item_update("lag")
-        self.reconnect_delay = 0
         self.reconnect_time = None
 
         if self.server_buffer:
@@ -454,6 +453,8 @@ class MatrixServer(object):
 
         if reconnect:
             self.schedule_reconnect()
+        else:
+            self.reconnect_delay = 0
 
     def connect(self):
         # type: (MatrixServer) -> int