diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 0189dd45..72fcbb05 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -3722,5 +3722,9 @@ bool Room::IsNewerMap()
 
 int Room::GetMobaLeftTime()
 {
-    return mt::Param::s().moba_revive_time - (GetFrameNo() * FRAME_RATE_MS / 1000);
+    if (moba_over_timer.expired()) {
+        return 0;
+    }
+    long long remain_time = xtimer.GetRemainTime(moba_over_timer);
+    return (remain_time * FRAME_RATE_MS / 1000);
 }