diff --git a/src/socketEvents/chat/sendMessage.ts b/src/socketEvents/chat/sendMessage.ts
index ffc00b3..fb94f93 100644
--- a/src/socketEvents/chat/sendMessage.ts
+++ b/src/socketEvents/chat/sendMessage.ts
@@ -1,9 +1,9 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../utilities/types'
-import CharacterRepository from '../../repositories/characterRepository'
 import ZoneRepository from '../../repositories/zoneRepository'
 import { isCommand } from '../../utilities/chat'
 import { gameLogger } from '../../utilities/logger'
+import CharacterManager from '../../managers/characterManager'
 
 type TypePayload = {
   message: string
@@ -26,7 +26,7 @@ export default class ChatMessageEvent {
         return
       }
 
-      const character = await CharacterRepository.getByUserAndId(this.socket.user?.id as number, this.socket.characterId as number)
+      const character = CharacterManager.getCharacterFromSocket(this.socket)
       if (!character) {
         gameLogger.error('chat:send_message error', 'Character not found')
         callback(false)