diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 65be105..7b7f7a7 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -100,7 +100,7 @@ void Player::UpdateMove()
     if (action_type == AT_Relive) {
         CancelAction();
     }
-    if (a8::HasBitFlag(status, HS_Fly)) {
+    if (dead || a8::HasBitFlag(status, HS_Fly)) {
         moving = false;
         moved_frames = 0;
         last_collision_door = nullptr;
@@ -139,7 +139,8 @@ void Player::UpdateMove()
 
 void Player::UpdateShot()
 {
-    if (a8::HasBitFlag(status, HS_Fly) ||
+    if (dead ||
+        a8::HasBitFlag(status, HS_Fly) ||
         a8::HasBitFlag(status, HS_Jump) ) {
         shot_start = false;
         shot_hold = false;