diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 5d395fd82..5ca764c67 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -1377,17 +1377,15 @@ var InternalClient = (function () {
 
 						var server = self.servers.get("id", data.guild_id);
 						if (server) {
-							if (data.is_private) {
-								client.emit("channelCreated", self.private_channels.add(new _StructuresPMChannel2["default"](data, client)));
+							var chan = null;
+							if (data.type === "text") {
+								chan = self.channels.add(new _StructuresTextChannel2["default"](data, client, server));
 							} else {
-								var chan = null;
-								if (data.type === "text") {
-									chan = self.channels.add(new _StructuresTextChannel2["default"](data, client, server));
-								} else {
-									chan = self.channels.add(new _StructuresVoiceChannel2["default"](data, client, server));
-								}
-								client.emit("channelCreated", server.channels.add(chan));
+								chan = self.channels.add(new _StructuresVoiceChannel2["default"](data, client, server));
 							}
+							client.emit("channelCreated", server.channels.add(chan));
+						} else if (data.is_private) {
+							client.emit("channelCreated", self.private_channels.add(new _StructuresPMChannel2["default"](data, client)));
 						} else {
 							client.emit("warn", "channel created but server does not exist");
 						}
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index e4a85bece..f691b41a4 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -1189,9 +1189,6 @@ export default class InternalClient {
 
 						var server = self.servers.get("id", data.guild_id);
 						if (server) {
-							if (data.is_private) {
-								client.emit("channelCreated", self.private_channels.add(new PMChannel(data, client)));
-							} else {
 								var chan = null;
 								if (data.type === "text") {
 									chan = self.channels.add(new TextChannel(data, client, server));
@@ -1199,8 +1196,9 @@ export default class InternalClient {
 									chan = self.channels.add(new VoiceChannel(data, client, server));
 								}
 								client.emit("channelCreated", server.channels.add(chan));
-							}
-						} else {
+						} else if(data.is_private){
+							client.emit("channelCreated", self.private_channels.add(new PMChannel(data, client)));
+						}else{
 							client.emit("warn", "channel created but server does not exist");
 						}