diff --git a/lib/discordrb/data.rb b/lib/discordrb/data.rb
index <HASH>..<HASH> 100644
--- a/lib/discordrb/data.rb
+++ b/lib/discordrb/data.rb
@@ -499,7 +499,7 @@ module Discordrb
       @afk_timeout = new_data[:afk_timeout] || new_data['afk_timeout'].to_i || @afk_timeout
 
       afk_channel_id = new_data[:afk_channel_id] || new_data['afk_channel_id'].to_i || @afk_channel.id
-      @afk_channel = @bot.channel(afk_channel_id) if !@afk_channel || afk_channel_id != @afk_channel.id
+      @afk_channel = @bot.channel(afk_channel_id) if !@afk_channel || (afk_channel_id != 0 && afk_channel_id != @afk_channel.id)
     end
 
     private
Only initialize the afk channel if the id isn't 0