diff --git a/ElunaCreatureAI.h b/ElunaCreatureAI.h
index 53434fc..f813c10 100644
--- a/ElunaCreatureAI.h
+++ b/ElunaCreatureAI.h
@@ -38,15 +38,16 @@ struct ElunaCreatureAI : ScriptedAI
     void UpdateAI(uint32 diff) override
 #endif
     {
+#ifdef TRINITY
+        //Spawns are handled by Creature.cpp - in function Creature::Update() 
+#else
         if (justSpawned)
         {
             justSpawned = false;
-#ifdef TRINITY
-            JustAppeared();
-#else
+
             JustRespawned();
-#endif
         }
+#endif
 
         if (!movepoints.empty())
         {