diff --git a/data/sql/updates/pending_db_world/rev_1606921345291246500.sql b/data/sql/updates/pending_db_world/rev_1606921345291246500.sql
new file mode 100644
index 000000000..57f75725d
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1606921345291246500.sql
@@ -0,0 +1,17 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1606921345291246500');
+
+-- update general tables
+DELETE FROM `broadcast_text` WHERE `id` IN (100003, 100004, 100005);
+INSERT INTO `broadcast_text` (`ID`, `Language`, `MaleText`, `FemaleText`, `EmoteID0`, `EmoteID1`, `EmoteID2`, `EmoteDelay0`, `EmoteDelay1`, `EmoteDelay2`, `SoundId`, `Unk1`, `Unk2`, `VerifiedBuild`)VALUES 
+(100003, 0, 'Mooooo...', '', 5, 0, 0, 0, 0, 0, 0, 0, 1, 18019),
+(100004, 0, 'Moooooooooo!', '', 5, 0, 0, 0, 0, 0, 0, 0, 1, 18019),
+(100005, 0, 'Thank you for bringing back my Bessy, $N. I couldn\'t live without her!', '', 5, 0, 0, 0, 0, 0, 0, 0, 1, 18019);
+
+-- update Bessy & Thadell messages
+DELETE FROM `creature_text` WHERE `creatureId` IN (20415, 20464);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `id`, `text`, `type`, `language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(20415, 0, 0, 'Mooooo...', 12, 0, 100, 0, 0, 0, 100003, 0, 'Bessy calmly moo when quest starts'),
+(20415, 1, 0, 'Moooooooooo!', 12, 0, 100, 0, 0, 0, 100004, 0, 'Bessy angry moo when being attacked'),
+(20464, 2, 0, 'Bessy, you''re home. Thank the Light!', 12, 0, 100, 0, 0, 0, 18181, 0, 'Thadell say to Bessy'),
+(20464, 3, 0, 'Thank you for bringing back my Bessy, $N. I couldn\'t live without her!', 12, 0, 100, 0, 0, 0, 100005, 0, 'Thadell say to player');
+
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index 1686eeea1..91778ccaa 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -1802,10 +1802,10 @@ enum BessyData
     N_THADELL       = 20464,
     SPAWN_FIRST     = 20512,
     SPAWN_SECOND    = 19881,
-    SAY_THADELL_1   = 0,
-    SAY_THADELL_2   = 1,
     SAY_BESSY_0     = 0,
-    SAY_BESSY_1     = 1
+    SAY_BESSY_1     = 1,
+    SAY_THADELL_1   = 2,
+    SAY_THADELL_2   = 3
 };
 
 class npc_bessy : public CreatureScript
@@ -1862,11 +1862,17 @@ public:
                 case 12:
                     player->GroupEventHappens(Q_ALMABTRIEB, me);
                     if (me->FindNearestCreature(N_THADELL, 30))
-                        Talk(SAY_THADELL_1);
+                    {
+                        Creature* thadell = me->FindNearestCreature(N_THADELL, 30);
+                        thadell->AI()->Talk(SAY_THADELL_1);
+                    }
                     break;
                 case 13:
                     if (me->FindNearestCreature(N_THADELL, 30))
-                        Talk(SAY_THADELL_2, player);
+                    {
+                        Creature* thadell = me->FindNearestCreature(N_THADELL, 30);
+                        thadell->AI()->Talk(SAY_THADELL_2, player);
+                    }
                     break;
             }
         }