diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index a35ffbd45..0b2fc19e1 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -356,7 +356,11 @@ var InternalClient = (function () {
 			this.chunkloaderCount[server.id] = Math.ceil(server.memberCount / 1000);
 		}
 		return new Promise(function (resolve, reject) {
-			_this4.chunkloaderCallback = resolve;
+			if (!server) {
+				resolve();
+			} else {
+				_this4.chunkloaderCallback = resolve;
+			}
 		});
 	};
 
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index 17ed2aa72..314e0d05e 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -264,7 +264,11 @@ export default class InternalClient {
 			this.chunkloaderCount[server.id] = Math.ceil(server.memberCount / 1000);
 		}
 		return new Promise((resolve, reject) => {
-			this.chunkloaderCallback = resolve;
+			if (!server) {
+				resolve();
+			} else {
+				this.chunkloaderCallback = resolve;
+			}
 		});
 	}