diff --git a/discord/server.py b/discord/server.py
index 765db2fbe..b3900e2a9 100644
--- a/discord/server.py
+++ b/discord/server.py
@@ -161,12 +161,11 @@ class Server(Hashable):
             data['roles'] = roles
             member = Member(**data)
             member.server = self
-
-            if member.id == owner_id:
-                self.owner = member
-
             self._add_member(member)
 
+        if 'owner_id' in guild:
+            self.owner = self.get_member(guild['owner_id'])
+
         for presence in guild.get('presences', []):
             user_id = presence['user']['id']
             member = self.get_member(user_id)