diff --git a/src/handlers/messages/MESSAGE_CREATE.ts b/src/handlers/messages/MESSAGE_CREATE.ts
index 2f9dbfb8a..87bee566a 100644
--- a/src/handlers/messages/MESSAGE_CREATE.ts
+++ b/src/handlers/messages/MESSAGE_CREATE.ts
@@ -27,10 +27,10 @@ export async function handleMessageCreate(data: DiscordGatewayPayload) {
     await cacheHandlers.set("members", discordenoMember.id, discordenoMember);
   }
 
-  if (payload.mentions) {
+  if (payload.mentions && guild) {
     await Promise.all(payload.mentions.map(async (mention) => {
       // Cache the member if its a valid member
-      if (mention.member && guild) {
+      if (mention.member) {
         const discordenoMember = await structures.createDiscordenoMember(
           { ...mention.member, user: mention } as GuildMemberWithUser,
           guild.id,