diff --git a/src/client/ClientDataResolver.js b/src/client/ClientDataResolver.js
index 0c289e239..50a7bb95e 100644
--- a/src/client/ClientDataResolver.js
+++ b/src/client/ClientDataResolver.js
@@ -46,7 +46,7 @@ class ClientDataResolver {
     if (typeof user === 'string') return this.client.users.get(user) || null;
     if (user instanceof GuildMember) return user.user;
     if (user instanceof Message) return user.author;
-    if (user instanceof Guild) return user.owner;
+    if (user instanceof Guild) return this.resolveUser(user.ownerID);
     return null;
   }