diff --git a/base/JaBa.js b/base/JaBa.js
index 24d48271..5c32ba58 100644
--- a/base/JaBa.js
+++ b/base/JaBa.js
@@ -64,9 +64,15 @@ class JaBa extends Client {
 		this.player
 			.on("playSong", async (queue, song) => {
 				const m = await queue.textChannel.send(this.translate("music/play:NOW_PLAYING", { songName: song.name }))
-				setTimeout(() => {
-					m.delete();
-				}, song.duration * 1000);
+				if (!song.isLive) {
+					setTimeout(() => {
+						if (!m.deleted) m.delete();
+					}, song.duration * 1000);
+				} else {
+					setTimeout(() => {
+						if (!m.deleted) m.delete();
+					}, 600 * 1000);
+				}
 			})
 			.on("addSong", (queue, song) => queue.textChannel.send(this.translate("music/play:ADDED_QUEUE", { songName: song.name })))
 			.on("addList", (queue, playlist) => queue.textChannel.send(this.translate("music/play:ADDED_QUEUE_COUNT", { songCount: playlist.songs.length })))
diff --git a/languages/en-US/music/play.json b/languages/en-US/music/play.json
index 4c5ae62a..61bdce33 100644
--- a/languages/en-US/music/play.json
+++ b/languages/en-US/music/play.json
@@ -18,5 +18,5 @@
 	"STOP_EMPTY": "I've just stopped the music as everyone disconnected from the channel.",
 	"RESULTS_CANCEL": "Search cancelled!",
 	"LIVE": "Live",
-	"ERR_OCCURRED": "An error occurred... Code: `{{error}}`"
+	"ERR_OCCURRED": "An error occurred, skipping...\n`{{error}}`"
 }
\ No newline at end of file
diff --git a/languages/ru-RU/music/play.json b/languages/ru-RU/music/play.json
index f320b702..eb71867d 100644
--- a/languages/ru-RU/music/play.json
+++ b/languages/ru-RU/music/play.json
@@ -18,5 +18,5 @@
 	"STOP_EMPTY": "Воспроизведение окончено, т.к. все вышли из голосового канала.",
 	"RESULTS_CANCEL": "Поиск отменён!",
 	"LIVE": "Прямая трансляция",
-	"ERR_OCCURRED": "Произошла ошибка... Код ошибки: `{{error}}`"
+	"ERR_OCCURRED": "Произошла ошибка, пропускаю...\n`{{error}}`"
 }
\ No newline at end of file