diff --git a/src/client/commands/play.js b/src/client/commands/play.js
index 753c069..96e2c94 100644
--- a/src/client/commands/play.js
+++ b/src/client/commands/play.js
@@ -135,13 +135,13 @@ function play(guild, client, url) {
         .on("finish", () => {
             console.log("Stream finished");
             client.funcs.statisticsUpdate(client, guild, radio);
-            radio.voiceChannel.leave();
+            radio.connection.destroy();
             client.radio.delete(guild.id);
             return;
         })
         .on("error", error => {
             console.error(error);
-            radio.voiceChannel.leave();
+            radio.connection.destroy();
             client.radio.delete(guild.id);
             return radio.textChannel.send(client.messages.errorPlaying);
         });
diff --git a/src/client/commands/stop.js b/src/client/commands/stop.js
index 6cc9a72..d87757f 100644
--- a/src/client/commands/stop.js
+++ b/src/client/commands/stop.js
@@ -10,7 +10,6 @@ module.exports = {
 		if (client.funcs.check(client, msg, command)) {
             client.funcs.statisticsUpdate(client, msg.guild, radio);
 			radio.connection.destroy();
-			radio.voiceChannel.leave();
 			client.radio.delete(msg.guild.id);
 			msg.channel.send(client.messageEmojis["stop"] + client.messages.stop);
 		}