diff --git a/src/game/Object/Creature.cpp b/src/game/Object/Creature.cpp
index 588932876..29aef85fb 100644
--- a/src/game/Object/Creature.cpp
+++ b/src/game/Object/Creature.cpp
@@ -196,8 +196,7 @@ Creature::~Creature()
 void Creature::AddToWorld()
 {
 #ifdef ENABLE_ELUNA
-    if (!IsInWorld())
-        sEluna->OnAddToWorld(this);
+    bool inWorld = IsInWorld();
 #endif /* ENABLE_ELUNA */
 
     ///- Register the creature for guid lookup
@@ -211,7 +210,7 @@ void Creature::AddToWorld()
         SetActiveObjectState(true);
 
 #ifdef ENABLE_ELUNA
-    if (!IsInWorld())
+    if (!inWorld)
         sEluna->OnAddToWorld(this);
 #endif /* ENABLE_ELUNA */
 }
diff --git a/src/game/Object/GameObject.cpp b/src/game/Object/GameObject.cpp
index 0c9fb02ab..42a022f93 100644
--- a/src/game/Object/GameObject.cpp
+++ b/src/game/Object/GameObject.cpp
@@ -93,8 +93,7 @@ GameObject::~GameObject()
 void GameObject::AddToWorld()
 {
 #ifdef ENABLE_ELUNA
-    if (!IsInWorld())
-        sEluna->OnAddToWorld(this);
+    bool inWorld = IsInWorld();
 #endif /* ENABLE_ELUNA */
 
     ///- Register the gameobject for guid lookup
@@ -110,7 +109,7 @@ void GameObject::AddToWorld()
     UpdateCollisionState();
 
 #ifdef ENABLE_ELUNA
-    if (!IsInWorld())
+    if (!inWorld)
         sEluna->OnAddToWorld(this);
 #endif /* ENABLE_ELUNA */
 }