diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 43607741..c3ac08b1 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -780,6 +780,9 @@ void Player::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg)
              },
              &xtimer_attacher);
     }
+    if (!room->game_over_timer.expired()) {
+        room->xtimer.Delete(room->game_over_timer);
+    }
 }
 
 void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)