diff --git a/server/gameserver/buff/hide.cc b/server/gameserver/buff/hide.cc
index 014b36e4..46f433e2 100644
--- a/server/gameserver/buff/hide.cc
+++ b/server/gameserver/buff/hide.cc
@@ -79,6 +79,12 @@ void HideBuff::Check()
                                        std::get<0>(tuple).Get(),
                                        std::get<0>(tuple).Get()->GetRadius()
                                        )) {
+                    if (!std::get<0>(tuple).Get()->dead) {
+                        if (owner->room->GetFrameNo() - std::get<1>(tuple) >= alert_time * SERVER_FRAME_RATE) {
+                            timeout = true;
+                            break;
+                        }
+                    }
                 } else {
                     leave_targets.push_back(pair.first);
                 }