diff --git a/src/helpers/messages/edit_message.ts b/src/helpers/messages/edit_message.ts
index c7f8f1522..cfd764247 100644
--- a/src/helpers/messages/edit_message.ts
+++ b/src/helpers/messages/edit_message.ts
@@ -1,6 +1,6 @@
 import { botId } from "../../bot.ts";
+import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
-import { DiscordenoMessage } from "../../structures/message.ts";
 import { structures } from "../../structures/mod.ts";
 import { Errors } from "../../types/discordeno/errors.ts";
 import { EditMessage } from "../../types/messages/edit_message.ts";
@@ -8,12 +8,19 @@ import type { Message } from "../../types/messages/message.ts";
 import type { PermissionStrings } from "../../types/permissions/permission_strings.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotChannelPermissions } from "../../util/permissions.ts";
-import { validateComponents } from "../../util/utils.ts";
+import { snakelize, validateComponents } from "../../util/utils.ts";
 
 /** Edit the message. */
-export async function editMessage(message: DiscordenoMessage, content: string | EditMessage) {
-  if (message.authorId !== botId) {
-    throw "You can only edit a message that was sent by the bot.";
+export async function editMessage(channelId: bigint, messageId: bigint, content: string | EditMessage) {
+  const message = await cacheHandlers.get("messages", messageId);
+
+  if (message) {
+    if (message.authorId !== botId) {
+      throw new Error("You can only edit a message that was sent by the bot.");
+    }
+    const requiredPerms: PermissionStrings[] = ["SEND_MESSAGES"];
+
+    await requireBotChannelPermissions(message.channelId, requiredPerms);
   }
 
   if (typeof content === "string") content = { content };
@@ -22,18 +29,14 @@ export async function editMessage(message: DiscordenoMessage, content: string |
     validateComponents(content.components);
   }
 
-  const requiredPerms: PermissionStrings[] = ["SEND_MESSAGES"];
-
-  await requireBotChannelPermissions(message.channelId, requiredPerms);
-
   if (content.content && content.content.length > 2000) {
     throw new Error(Errors.MESSAGE_MAX_LENGTH);
   }
 
   const result = await rest.runMethod<Message>(
     "patch",
-    endpoints.CHANNEL_MESSAGE(message.channelId, message.id),
-    content
+    endpoints.CHANNEL_MESSAGE(channelId, messageId),
+    snakelize(content)
   );
 
   return await structures.createDiscordenoMessage(result);
diff --git a/src/structures/message.ts b/src/structures/message.ts
index 9a6922a82..8a68805db 100644
--- a/src/structures/message.ts
+++ b/src/structures/message.ts
@@ -69,7 +69,7 @@ const baseMessage: Partial<DiscordenoMessage> = {
     return deleteMessage(this.channelId!, this.id!, reason, delayMilliseconds);
   },
   edit(content) {
-    return editMessage(this as DiscordenoMessage, content);
+    return editMessage(this.channelId!, this.id!, content);
   },
   pin() {
     return pinMessage(this.channelId!, this.id!);
diff --git a/tests/messages/edit_message.ts b/tests/messages/edit_message.ts
index 327dcc7ab..d107c2953 100644
--- a/tests/messages/edit_message.ts
+++ b/tests/messages/edit_message.ts
@@ -19,7 +19,7 @@ async function ifItFailsBlameWolf(type: "getter" | "raw") {
 
   // Edit the message now
   if (type === "raw") {
-    await editMessage(message, "Goodbye World!");
+    await editMessage(message.channelId, message.id, "Goodbye World!");
   } else {
     await message.edit("Goodbye World!");
   }