diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index b680ccb57b..d25dfc2f0a 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -408,6 +408,9 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u
     if (goinfo->IsLargeGameObject())
         SetVisibilityDistanceOverride(VisibilityDistanceType::Large);

+    if (GetGoType() == GAMEOBJECT_TYPE_DOOR || GetGoType() == GAMEOBJECT_TYPE_FLAGSTAND || GetGoType() == GAMEOBJECT_TYPE_FLAGDROP || GetGoType() == GAMEOBJECT_TYPE_DUNGEON_DIFFICULTY || GetGoType() == GAMEOBJECT_TYPE_TRAPDOOR)
+       SetVisibilityDistanceOverride(VisibilityDistanceType::Infinite);
+
     return true;
 }