diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index a159ebbfd..fad53f256 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -400,6 +400,12 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u
         SetVisibilityDistanceOverride(VisibilityDistanceType::Large);
     }
 
+    // Check if GameObject is Infinite
+    if (goinfo->IsInfiniteGameObject())
+    {
+        SetVisibilityDistanceOverride(VisibilityDistanceType::Infinite);
+    }
+
     return true;
 }
 
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index 1a71c1f38..f65691903 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -624,6 +624,25 @@ struct GameObjectTemplate
         }
     }
 
+    [[nodiscard]] bool IsInfiniteGameObject() const
+    {
+        switch (type)
+        {
+            case GAMEOBJECT_TYPE_DOOR:
+                return true;
+            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;
+            default:
+                return false;
+        }
+    }
+
     [[nodiscard]] bool IsGameObjectForQuests() const
     {
         return IsForQuests;