diff --git a/server/gameserver/movement.cc b/server/gameserver/movement.cc
index 055ef91..067dc2f 100644
--- a/server/gameserver/movement.cc
+++ b/server/gameserver/movement.cc
@@ -163,19 +163,12 @@ bool MovementComponent::TestCollision()
         for (Entity* entity : detection_objects) {
             switch (entity->entity_type) {
             case ET_Obstacle:
-                {
-                    if (
-                        (hum->last_collision_door == nullptr || hum->last_collision_door != entity) &&
-                        hum->TestCollision(entity)
-                        ){
-                        return true;
-                    }
-                }
-                break;
             case ET_Building:
                 {
-                    if (hum->TestCollision(entity)) {
-                        return true;
+                    if (!entity->dead && hum->TestCollision(entity)) {
+                        if (hum->last_collision_door != entity) {
+                            return true;
+                        }
                     }
                 }
                 break;