diff --git a/src/Client.js b/src/Client.js
index 39c43e3c1..07f3ad27f 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -621,8 +621,10 @@ class Client extends EventEmitter {
 						callback(err);
 						reject(err);
 					} else {
-						if (self.getServer("id", res.body.guild.id)) {
-							resolve(self.getServer("id", res.body.guild.id));
+						var server = self.getServer("id", res.body.guild.id);
+						if (server) {
+							callback(null, server);
+							resolve(server);
 						} else {
 							self.serverCreateListener[res.body.guild.id] = [resolve, callback];
 						}