diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index c5ca5be3fa..92774fd267 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1136,9 +1136,6 @@ bool GameObject::IsAlwaysVisibleFor(WorldObject const* seer) const
     if (WorldObject::IsAlwaysVisibleFor(seer))
         return true;
 
-    if (IsTransport() || IsDestructibleBuilding())
-        return true;
-
     if (!seer)
         return false;
 
diff --git a/src/server/game/Entities/GameObject/GameObjectData.h b/src/server/game/Entities/GameObject/GameObjectData.h
index 30fe1e2c3f..907e21e483 100644
--- a/src/server/game/Entities/GameObject/GameObjectData.h
+++ b/src/server/game/Entities/GameObject/GameObjectData.h
@@ -567,7 +567,13 @@ struct GameObjectTemplate
     {
         switch (type)
         {
-            case GAMEOBJECT_TYPE_DOOR:          return door.InfiniteAOI != 0;
+            case GAMEOBJECT_TYPE_DOOR:                      return door.InfiniteAOI != 0;
+            case GAMEOBJECT_TYPE_FLAGSTAND:                 return true;
+            case GAMEOBJECT_TYPE_FLAGDROP:                  return true;
+            case GAMEOBJECT_TYPE_DUNGEON_DIFFICULTY:        return true;
+            case GAMEOBJECT_TYPE_TRAPDOOR:                  return true;
+            case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING:     return true;
+            case GAMEOBJECT_TYPE_TRANSPORT:                 return true;
             default: return false;
         }
     }