diff --git a/Source/Game/Chat/Commands/MiscCommands.cs b/Source/Game/Chat/Commands/MiscCommands.cs
index f41d702fc..34cc4b430 100644
--- a/Source/Game/Chat/Commands/MiscCommands.cs
+++ b/Source/Game/Chat/Commands/MiscCommands.cs
@@ -1759,7 +1759,7 @@ namespace Game.Chat
 
             if (target)
             {
-                if (target.CanSpeak())
+                if (target.GetSession().CanSpeak())
                 {
                     handler.SendSysMessage(CypherStrings.ChatAlreadyEnabled);
                     return false;
diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index 97e907ce7..04edf0a9b 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -5783,11 +5783,6 @@ namespace Game.Entities
             UpdateItemLevelAreaBasedScaling();
         }
 
-        public bool CanSpeak()
-        {
-            return GetSession().m_muteTime <= Time.UnixTime;
-        }
-
         public void RemoveSocial()
         {
             Global.SocialMgr.RemovePlayerSocial(GetGUID());
diff --git a/Source/Game/Handlers/ChatHandler.cs b/Source/Game/Handlers/ChatHandler.cs
index c0576e10c..5e242db0d 100644
--- a/Source/Game/Handlers/ChatHandler.cs
+++ b/Source/Game/Handlers/ChatHandler.cs
@@ -166,7 +166,7 @@ namespace Game
                     lang = (Language)ModLangAuras.FirstOrDefault().GetMiscValue();
             }
 
-            if (!sender.CanSpeak())
+            if (!CanSpeak())
             {
                 string timeStr = Time.secsToTimeString((ulong)(m_muteTime - Time.UnixTime));
                 SendNotification(CypherStrings.WaitBeforeSpeaking, timeStr);
@@ -555,7 +555,7 @@ namespace Game
             if (!GetPlayer().IsAlive())
                 return;
 
-            if (!GetPlayer().CanSpeak())
+            if (!CanSpeak())
             {
                 string timeStr = Time.secsToTimeString((ulong)(m_muteTime - Time.UnixTime));
                 SendNotification(CypherStrings.WaitBeforeSpeaking, timeStr);
diff --git a/Source/Game/Server/WorldSession.cs b/Source/Game/Server/WorldSession.cs
index 6afad789e..6f3924226 100644
--- a/Source/Game/Server/WorldSession.cs
+++ b/Source/Game/Server/WorldSession.cs
@@ -554,6 +554,11 @@ namespace Game
             SendPacket(packet);
         }
 
+        public bool CanSpeak()
+        {
+            return m_muteTime <= GameTime.GetGameTime();
+        }
+
         public void SendNotification(CypherStrings str, params object[] args)
         {
             SendNotification(Global.ObjectMgr.GetCypherString(str), args);