diff --git a/src/game/game_handler.cpp b/src/game/game_handler.cpp
index 32ce3e2e..604ad34a 100644
--- a/src/game/game_handler.cpp
+++ b/src/game/game_handler.cpp
@@ -1323,6 +1323,8 @@ void GameHandler::update(float deltaTime) {
 
         const bool classicLikeCombatSync =
             (combatHandler_ && combatHandler_->hasAutoAttackIntent()) && (isPreWotlk());
+        // Must match the locomotion bitmask in movement_handler.cpp so both
+        // sites agree on what constitutes "moving" for heartbeat throttling.
         const uint32_t locomotionFlags =
             static_cast<uint32_t>(MovementFlags::FORWARD) |
             static_cast<uint32_t>(MovementFlags::BACKWARD) |
@@ -1331,6 +1333,8 @@ void GameHandler::update(float deltaTime) {
             static_cast<uint32_t>(MovementFlags::TURN_LEFT) |
             static_cast<uint32_t>(MovementFlags::TURN_RIGHT) |
             static_cast<uint32_t>(MovementFlags::ASCENDING) |
+            static_cast<uint32_t>(MovementFlags::DESCENDING) |
+            static_cast<uint32_t>(MovementFlags::SWIMMING) |
             static_cast<uint32_t>(MovementFlags::FALLING) |
             static_cast<uint32_t>(MovementFlags::FALLINGFAR);
         const bool classicLikeStationaryCombatSync =