diff --git a/lib/Client.js b/lib/Client.js
index 7ec3d6204..bd23f2252 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -761,7 +761,14 @@ class Client extends EventEmitter {
     */
     createRole(guildID, options, reason) {
         options.reason = reason;
-        return this.requestHandler.request("POST", Endpoints.GUILD_ROLES(guildID), true, options).then((role) => new Role(role, this.guilds.get(guildID)));
+        return this.requestHandler.request("POST", Endpoints.GUILD_ROLES(guildID), true, options).then((role) => {
+            const guild = this.guilds.get(guildID);
+            if(guild) {
+                return guild.roles.add(role, guild);
+            } else {
+                return new Role(role);
+            }
+        });
     }
 
     /**