diff --git a/lib/Client.js b/lib/Client.js
index 67c27c047..212386752 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -154,7 +154,7 @@ var Client = (function () {
 							self.token = res.body.token; //set our token
 
 							self.getGateway().then(function (url) {
-								self.createws(url);
+								self.createws(url.replace("discord.gg", "discordapp.net"));
 								callback(null, self.token);
 								resolve(self.token);
 							})["catch"](function (err) {
diff --git a/src/Client.js b/src/Client.js
index 336d704f9..d0a9e3a79 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -168,7 +168,7 @@ class Client {
 							self.token = res.body.token; //set our token
 							
 							self.getGateway().then(function (url) {
-								self.createws(url);
+								self.createws(url.replace("discord.gg", "discordapp.net"));
 								callback(null, self.token);
 								resolve(self.token);
 							}).catch(function (err) {