diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp
index 7c5b9fba41..1e2f3132ff 100644
--- a/src/server/scripts/Northrend/zone_dalaran.cpp
+++ b/src/server/scripts/Northrend/zone_dalaran.cpp
@@ -526,6 +526,7 @@ struct npc_minigob_manabonk : public ScriptedAI
     void Reset() override
     {
         me->SetVisible(false);
+        playerGUID.Clear();
         events.ScheduleEvent(EVENT_SELECT_TARGET, 1s);
     }
 
@@ -579,6 +580,11 @@ struct npc_minigob_manabonk : public ScriptedAI
                 case EVENT_POLYMORPH:
                     if (Player* player = ObjectAccessor::GetPlayer(*me, playerGUID))
                     {
+                        if (player->IsGameMaster())
+                        {
+                            me->DespawnOrUnsummon();
+                            return;
+                        }
                         DoCast(player, SPELL_MANABONKED);
                         SendMailToPlayer(player);
                     }