diff --git a/src/handlers/guilds/GUILD_CREATE.ts b/src/handlers/guilds/GUILD_CREATE.ts
index 3bd318705..32222e975 100644
--- a/src/handlers/guilds/GUILD_CREATE.ts
+++ b/src/handlers/guilds/GUILD_CREATE.ts
@@ -23,6 +23,8 @@ export async function handleGuildCreate(
     await cacheHandlers.delete("unavailableGuilds", payload.id);
 
     shard.unavailableGuildIds.delete(payload.id);
+
+    return eventHandlers.guildAvailable?.(guildStruct);
   }
 
   if (!cache.isReady) return eventHandlers.guildLoaded?.(guildStruct);
diff --git a/src/handlers/guilds/GUILD_DELETE.ts b/src/handlers/guilds/GUILD_DELETE.ts
index 10ab94493..4b904d5e5 100644
--- a/src/handlers/guilds/GUILD_DELETE.ts
+++ b/src/handlers/guilds/GUILD_DELETE.ts
@@ -18,9 +18,11 @@ export async function handleGuildDelete(
     if (shard) shard.unavailableGuildIds.add(payload.id);
 
     await cacheHandlers.set("unavailableGuilds", payload.id, Date.now());
-  }
 
-  eventHandlers.guildDelete?.(guild);
+    eventHandlers.guildUnavailable?.(guild);
+  } else {
+    eventHandlers.guildDelete?.(guild);
+  }
 
   cacheHandlers.forEach("messages", (message) => {
     if (message.guildId === payload.id) {