diff --git a/mumbledj/mumbledj.lua b/mumbledj/mumbledj.lua
index ee9b518..64c9d5b 100644
--- a/mumbledj/mumbledj.lua
+++ b/mumbledj/mumbledj.lua
@@ -173,6 +173,7 @@ function skip(username)
 		local skip_ratio = song_queue:count_skippers() / count_users()
 		if skip_ratio > config.SKIP_RATIO then
 			piepan.me.channel:send(config.SONG_SKIPPED_HTML)
+			piepan.Audio:stop()
 			next_song()
 		else
 			piepan.me.channel:send(string.format(config.USER_SKIP_HTML, username))
diff --git a/mumbledj/song_queue.lua b/mumbledj/song_queue.lua
index f918e82..517cb49 100644
--- a/mumbledj/song_queue.lua
+++ b/mumbledj/song_queue.lua
@@ -98,6 +98,9 @@ function start_song(info)
 		os.execute("sleep " .. tonumber(2))
 	end
 	if not file_exists(".video_fail") then
+		if piepan.Audio:isPlaying() then
+			piepan.Audio:stop()
+		end
 		piepan.me.channel:play("song-converted.ogg", SongQueue.get_next_song)
 	else
 		return false