diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index 273fa0dc33a..5dd183dbdba 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -1044,10 +1044,11 @@ public:
 enum WatchCommanderLeonus
 {
     SAY_COVER                   = 0,
-    EVENT_LEONUS_TALK           = 1,
-    EVENT_INFERNAL_RAIN_ATTACK  = 2,
-    EVENT_FEAR_CONTROLLER_CAST  = 3,
-    EVENT_ACTIVE_FALSE          = 4,
+    EVENT_START                 = 1,
+    EVENT_LEONUS_TALK           = 2,
+    EVENT_INFERNAL_RAIN_ATTACK  = 3,
+    EVENT_FEAR_CONTROLLER_CAST  = 4,
+    EVENT_ACTIVE_FALSE          = 5,
     NPC_INFERNAL_RAIN           = 18729,
     SPELL_INFERNAL_RAIN         = 33814,
     NPC_FEAR_CONTROLLER         = 19393,
@@ -1061,9 +1062,7 @@ struct npc_watch_commander_leonus : public ScriptedAI
     void Reset() override
     {
         _events.Reset();
-        _events.ScheduleEvent(EVENT_LEONUS_TALK, Minutes(2), Minutes(10));
-        _events.ScheduleEvent(EVENT_INFERNAL_RAIN_ATTACK, Minutes(2), Minutes(10));
-        _events.ScheduleEvent(EVENT_FEAR_CONTROLLER_CAST, Minutes(2), Minutes(10));
+        _events.ScheduleEvent(EVENT_START, Minutes(2), Minutes(10));
     }
 
     void SetData(uint32 /*type*/, uint32 data) override
@@ -1086,6 +1085,11 @@ struct npc_watch_commander_leonus : public ScriptedAI
         {
             switch (eventId)
             {
+                case EVENT_START:
+                    _events.ScheduleEvent(EVENT_LEONUS_TALK, Minutes(2), Minutes(10));
+                    _events.ScheduleEvent(EVENT_INFERNAL_RAIN_ATTACK, Minutes(2), Minutes(10));
+                    _events.ScheduleEvent(EVENT_FEAR_CONTROLLER_CAST, Minutes(2), Minutes(10));
+                    break;
                 case EVENT_LEONUS_TALK:
                     Talk(SAY_COVER);
                     me->HandleEmoteCommand(EMOTE_ONESHOT_SHOUT);