diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 7a192f0c2..c1dc64c6d 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -110,9 +110,7 @@ enum Misc
 {
     MAX_BOMB_COUNT              = 40,
 
-    SCHEDULER_GROUP_HATCHING    = 1,
-
-    EVENT_BERSERK               = 0
+    SCHEDULER_GROUP_HATCHING    = 1
 };
 
 struct boss_janalai : public BossAI
@@ -144,6 +142,8 @@ struct boss_janalai : public BossAI
         ScheduleHealthCheckEvent(25, [&] {
             DoCastSelf(SPELL_ENRAGE, true);
         });
+
+        me->m_Events.KillAllEvents(false);
     }
 
     void JustDied(Unit* killer) override
@@ -205,10 +205,11 @@ struct boss_janalai : public BossAI
                 });
             }
         }, 8s);
-        ScheduleUniqueTimedEvent(5min, [&]{
+
+        me->m_Events.AddEventAtOffset([&] {
             Talk(SAY_BERSERK);
             DoCastSelf(SPELL_BERSERK);
-        }, EVENT_BERSERK);
+        }, 5min);
     }
 
     bool HatchAllEggs(uint32 hatchAction)