diff --git a/lib/discordrb/data/message.rb b/lib/discordrb/data/message.rb
index 9112711c3..b2583cdb9 100644
--- a/lib/discordrb/data/message.rb
+++ b/lib/discordrb/data/message.rb
@@ -83,7 +83,7 @@ def initialize(data, bot)
       @referenced_message = Message.new(data['referenced_message'], bot) if data['referenced_message']
       @message_reference = data['message_reference']
 
-      @server = bot.server(data['guild_id'].to_i) if data['guild_id']
+      @server = @channel.server
 
       @author = if data['author']
                   if data['author']['discriminator'] == ZERO_DISCRIM
diff --git a/spec/data/message_spec.rb b/spec/data/message_spec.rb
index db4a2355e..ce2d8416e 100644
--- a/spec/data/message_spec.rb
+++ b/spec/data/message_spec.rb
@@ -103,6 +103,8 @@
       data['channel_id'] = channel_id
 
       message = described_class.new(data, bot)
+      message.instance_variable_set(:@server, nil)
+
       expect(message.link).to eq 'https://discord.com/channels/@me/channel_id/message_id'
     end
   end