diff --git a/matrix/server.py b/matrix/server.py
index d296e60..2b07a40 100644
--- a/matrix/server.py
+++ b/matrix/server.py
@@ -478,6 +478,7 @@ def matrix_timer_cb(server_name, remaining_calls):
             server.reconnect_time and
             current_time >= (server.reconnect_time + server.reconnect_delay)):
         server.reconnect()
+        return W.WEECHAT_RC_OK
 
     if not server.connected:
         return W.WEECHAT_RC_OK
@@ -494,6 +495,7 @@ def matrix_timer_cb(server_name, remaining_calls):
         if server.lag > 300000:
             server.disconnect()
             server.schedule_reconnect()
+            return W.WEECHAT_RC_OK
 
     while server.send_queue:
         message = server.send_queue.popleft()