diff --git a/src/managers/GuildManager.js b/src/managers/GuildManager.js
index c2747580e..8a28e06b2 100644
--- a/src/managers/GuildManager.js
+++ b/src/managers/GuildManager.js
@@ -6,6 +6,8 @@ const { Events } = require('../util/Constants');
 const Guild = require('../structures/Guild');
 const GuildChannel = require('../structures/GuildChannel');
 const GuildMember = require('../structures/GuildMember');
+const GuildEmoji = require('../structures/GuildEmoji');
+const Invite = require('../structures/Invite');
 const Role = require('../structures/Role');
 
 /**
@@ -27,9 +29,11 @@ class GuildManager extends BaseManager {
    * Data that resolves to give a Guild object. This can be:
    * * A Guild object
    * * A GuildChannel object
+   * * A GuildEmoji object
    * * A Role object
    * * A Snowflake
-   * @typedef {Guild|GuildChannel|GuildMember|Role|Snowflake} GuildResolvable
+   * * An Invite object
+   * @typedef {Guild|GuildChannel|GuildMember|GuildEmoji|Role|Snowflake|Invite} GuildResolvable
    */
 
   /**
@@ -43,7 +47,9 @@ class GuildManager extends BaseManager {
   resolve(guild) {
     if (guild instanceof GuildChannel ||
       guild instanceof GuildMember ||
-      guild instanceof Role) return super.resolve(guild.guild);
+      guild instanceof GuildEmoji ||
+      guild instanceof Role ||
+      (guild instanceof Invite && guild.guild)) return super.resolve(guild.guild);
     return super.resolve(guild);
   }
 
@@ -58,7 +64,9 @@ class GuildManager extends BaseManager {
   resolveID(guild) {
     if (guild instanceof GuildChannel ||
       guild instanceof GuildMember ||
-      guild instanceof Role) return super.resolveID(guild.guild.id);
+      guild instanceof GuildEmoji ||
+      guild instanceof Role ||
+      (guild instanceof Invite && guild.guild)) return super.resolveID(guild.guild.id);
     return super.resolveID(guild);
   }
 
@@ -92,7 +100,7 @@ class GuildManager extends BaseManager {
               resolve(this.client.guilds.add(data));
             }, 10000);
             return undefined;
-          }, reject)
+          }, reject),
       );
     }
 
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 1b12e82d2..ecfa6f1d2 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -2332,7 +2332,7 @@ declare module 'discord.js' {
 
 	type GuildMemberResolvable = GuildMember | UserResolvable;
 
-	type GuildResolvable = Guild | GuildChannel | GuildMember | Role | Snowflake;
+	type GuildResolvable = Guild | GuildChannel | GuildMember | GuildEmoji | Invite | Role | Snowflake;
 
 	interface GuildPruneMembersOptions {
 		count?: boolean;