diff --git a/src/api/handlers/webhook.ts b/src/api/handlers/webhook.ts
index 4f3eef451..fbda171f8 100644
--- a/src/api/handlers/webhook.ts
+++ b/src/api/handlers/webhook.ts
@@ -252,9 +252,10 @@ export async function editWebhookMessage(
   const result = await RequestManager.patch(
     endpoints.WEBHOOK_MESSAGE(webhookID, webhookToken, messageID),
     { ...options, allowed_mentions: options.allowed_mentions },
-  );
+  ) as MessageCreateOptions;
 
-  return result;
+  const message = await structures.createMessage(result);
+  return message;
 }
 
 export async function deleteWebhookMessage(
@@ -562,5 +563,11 @@ export async function editSlashResponse(
     options,
   );
 
-  return result;
+  // If the original message was edited, this will not return a message
+  if (!options.messageID) return result;
+
+  const message = await structures.createMessage(
+    result as MessageCreateOptions,
+  );
+  return message;
 }