diff --git a/data/sql/updates/pending_db_world/rev_1477254708321947900.sql b/data/sql/updates/pending_db_world/rev_1477254708321947900.sql
new file mode 100644
index 000000000..fe7bed88e
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1477254708321947900.sql
@@ -0,0 +1,3 @@
++INSERT INTO version_db_world(`sql_rev`) VALUES ('1477254708321947900');
++
++UPDATE `creature_text` SET `text` = "$N! I'm watching you!" WHERE `entry` = "11382" AND `groupid` = "2"
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 3ae8580cd..6ff8bcaa7 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -104,14 +104,14 @@ class boss_mandokir : public CreatureScript
             {
                 if (me->GetPositionZ() > 140.0f)
                 {
-                    _Reset();
+                    
                     killCount = 0;
-                    me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC);
                     events.ScheduleEvent(EVENT_CHECK_START, 1000);
                     if (Creature* speaker = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_VILEBRANCH_SPEAKER)))
                         if (!speaker->IsAlive())
                             speaker->Respawn(true);
                 }
+                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC);
                 summons.DespawnAll();
                 me->Mount(MODEL_OHGAN_MOUNT);
             }
@@ -174,7 +174,7 @@ class boss_mandokir : public CreatureScript
                     {
                         me->SetHomePosition(PosMandokir[0]);
                         instance->SetBossState(DATA_MANDOKIR, NOT_STARTED);
-                        me->DespawnOrUnsummon(6000); // No idea how to respawn on wipe.
+                        
                     }
                 }
             }
@@ -202,7 +202,6 @@ class boss_mandokir : public CreatureScript
                                     break;
                                 case EVENT_STARTED:
                                     me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC);
-                                    me->GetMotionMaster()->MovePath(PATH_MANDOKIR, false);
                                     break;
                                 default:
                                     break;