diff --git a/src/GoldRush.cpp b/src/GoldRush.cpp
index 31ec8c2..dadd0d5 100644
--- a/src/GoldRush.cpp
+++ b/src/GoldRush.cpp
@@ -5,7 +5,6 @@
 #include "DBCStores.h"
 #include "GameObject.h"
 #include "Log.h"
-#include "WorldSessionMgr.h"
 #include "Map.h"
 #include "MapMgr.h"
 #include "ObjectAccessor.h"
@@ -325,7 +324,7 @@ public:
                 _currentSite.MapId, _currentSite.ZoneId, _currentSite.AreaId, anchor->GetName());
         }
 
-        sWorldSessionMgr->SendServerMessage(SERVER_MSG_STRING, Acore::StringFormat(_config.StartMessage, FormatLocationForAnnouncement(_currentSite, anchor)));
+        ChatHandler(nullptr).SendWorldText(Acore::StringFormat(_config.StartMessage, FormatLocationForAnnouncement(_currentSite, anchor)));
 
         if (_config.Debug)
         {
@@ -878,7 +877,7 @@ private:
         }
 
         std::string announcementLocation = FormatLocationForAnnouncement(_currentSite, anchor);
-        sWorldSessionMgr->SendServerMessage(SERVER_MSG_STRING, Acore::StringFormat(_config.StartMessage, announcementLocation));
+        ChatHandler(nullptr).SendWorldText(Acore::StringFormat(_config.StartMessage, announcementLocation));
 
         if (_config.Debug)
         {
@@ -899,7 +898,7 @@ private:
             return;
 
         std::string location = BuildLocationText(_currentSite);
-        sWorldSessionMgr->SendServerMessage(SERVER_MSG_STRING, Acore::StringFormat(_config.EndMessage, location));
+        ChatHandler(nullptr).SendWorldText(Acore::StringFormat(_config.EndMessage, location));
 
         if (_config.Debug)
             LOG_INFO(GoldRushLogFilter, "Gold Rush ended in {}{}.", location, forced ? " (forced)" : "");