diff --git a/src/handlers/guilds/GUILD_DELETE.ts b/src/handlers/guilds/GUILD_DELETE.ts
index 1c5d5ed94..b8dbe9e2c 100644
--- a/src/handlers/guilds/GUILD_DELETE.ts
+++ b/src/handlers/guilds/GUILD_DELETE.ts
@@ -1,13 +1,28 @@
 import { eventHandlers } from "../../bot.ts";
+import { cacheHandlers } from "../../cache.ts";
 import { DiscordPayload, GuildDeletePayload } from "../../types/mod.ts";
 import { basicShards } from "../../ws/shard.ts";
-import { cacheHandlers } from "../../cache.ts";
 
 export async function handleGuildDelete(
   data: DiscordPayload,
   shardID: number,
 ) {
   const payload = data.d as GuildDeletePayload;
+
+  const guild = await cacheHandlers.get("guilds", payload.id);
+  if (!guild) return;
+
+  await cacheHandlers.delete("guilds", payload.id);
+
+  if (payload.unavailable) {
+    const shard = basicShards.get(shardID);
+    if (shard) shard.unavailableGuildIDs.add(payload.id);
+
+    await cacheHandlers.set("unavailableGuilds", payload.id, Date.now());
+  }
+
+  eventHandlers.guildDelete?.(guild);
+
   cacheHandlers.forEach("messages", (message) => {
     if (message.guildID === payload.id) {
       cacheHandlers.delete("messages", message.id);
@@ -20,30 +35,15 @@ export async function handleGuildDelete(
     }
   });
 
-  cacheHandlers.forEach("members", async (member) => {
+  cacheHandlers.forEach("members", (member) => {
     if (!member.guilds.has(payload.id)) return;
 
     member.guilds.delete(payload.id);
 
     if (!member.guilds.size) {
-      await cacheHandlers.delete("members", member.id);
-      return;
+      return cacheHandlers.delete("members", member.id);
     }
 
-    await cacheHandlers.set("members", member.id, member);
+    cacheHandlers.set("members", member.id, member);
   });
-
-  if (payload.unavailable) {
-    const shard = basicShards.get(shardID);
-    if (shard) shard.unavailableGuildIDs.add(payload.id);
-
-    return cacheHandlers.set("unavailableGuilds", payload.id, Date.now());
-  }
-
-  const guild = await cacheHandlers.get("guilds", payload.id);
-  if (!guild) return;
-
-  await cacheHandlers.delete("guilds", payload.id);
-
-  eventHandlers.guildDelete?.(guild);
 }