diff --git a/src/structures/ClientApplication.js b/src/structures/ClientApplication.js
index ac712bb6a..9288d900f 100644
--- a/src/structures/ClientApplication.js
+++ b/src/structures/ClientApplication.js
@@ -68,9 +68,13 @@ class ClientApplication extends Base {
 
     /**
      * The owner of this OAuth application
-     * @type {User|Team}
+     * @type {?User|Team}
      */
-    this.owner = data.team ? new Team(this.client, data.team) : this.client.users.add(data.owner);
+    this.owner = data.team ?
+      new Team(this.client, data.team) ?
+        data.owner :
+        this.client.users.add(data.owner) :
+      null;
   }
 
   /**
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 8d4c02943..de3255919 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -255,7 +255,7 @@ declare module 'discord.js' {
 		public icon: string;
 		public id: Snowflake;
 		public name: string;
-		public owner: User | Team;
+		public owner: User | Team | null;
 		public rpcOrigins: string[];
 		public coverImage(options?: AvatarOptions): string;
 		public fetchAssets(): Promise<ClientApplicationAsset>;