diff --git a/packages/bot/src/handlers/channels/CHANNEL_DELETE.ts b/packages/bot/src/handlers/channels/CHANNEL_DELETE.ts
index 208f1b749..0f3c9d345 100644
--- a/packages/bot/src/handlers/channels/CHANNEL_DELETE.ts
+++ b/packages/bot/src/handlers/channels/CHANNEL_DELETE.ts
@@ -5,7 +5,6 @@ export async function handleChannelDelete(bot: Bot, data: DiscordGatewayPayload)
   if (!bot.events.channelDelete) return
 
   const payload = data.d as DiscordChannel
-  if (!payload.guild_id) return
 
   bot.events.channelDelete(
     bot.transformers.channel(bot, {
diff --git a/packages/bot/src/handlers/voice/VOICE_STATE_UPDATE.ts b/packages/bot/src/handlers/voice/VOICE_STATE_UPDATE.ts
index 367b36052..1e9df1cd0 100644
--- a/packages/bot/src/handlers/voice/VOICE_STATE_UPDATE.ts
+++ b/packages/bot/src/handlers/voice/VOICE_STATE_UPDATE.ts
@@ -5,6 +5,7 @@ export async function handleVoiceStateUpdate(bot: Bot, data: DiscordGatewayPaylo
   if (!bot.events.voiceStateUpdate) return
 
   const payload = data.d as DiscordVoiceState
+  // TODO: We have to wait for #4372 to get merged to remove this check...
   if (!payload.guild_id) return
 
   const guildId = bot.transformers.snowflake(payload.guild_id)