diff --git a/SRC/LUA/FUNCTIONS.LUA b/SRC/LUA/FUNCTIONS.LUA
index 52b5961..cb03d6a 100644
--- a/SRC/LUA/FUNCTIONS.LUA
+++ b/SRC/LUA/FUNCTIONS.LUA
@@ -278,7 +278,7 @@ end)
 rawset(_G, "MM_PlayerQuit", function(p)
 	if (p.role == ROLE_MURDERER)
 		p.role = ROLE_NONE
-		if ((not PlayerCount(ROLE_INNOCENT)) and (not PlayerCount(ROLE_MURDERER)))
+		if ((not PlayerCount(ROLE_INNOCENT)) and (not PlayerCount(ROLE_MURDERER))) or ((PlayerCount(ROLE_INNOCENT) == 1) and (not PlayerCount(ROLE_SHERIFF)) and (not PlayerCount(ROLE_HERO)) and (not PlayerCount(ROLE_MURDERER)))
 			MM_EndRound(0, "LAST_LEFT", ROLE_MURDERER)
 		elseif (PlayerCount(ROLE_INNOCENT) and (not PlayerCount(ROLE_MURDERER)))
 			MM_ChatprintGlobal("REPLACE_LEFT", ROLE_MURDERER)
diff --git a/SRC/LUA/GAME.LUA b/SRC/LUA/GAME.LUA
index c6ecb4f..973102d 100644
--- a/SRC/LUA/GAME.LUA
+++ b/SRC/LUA/GAME.LUA
@@ -452,11 +452,12 @@ end)
 --
 addHook("MusicChange", function(old, new)
     if (gametype != GT_LTMMURDERMYSTERY) return end
-	
+
 	--Showdown Duel music
 	if ((gamestate == GS_LEVEL) and (MM.shwdwn) and (leveltime) and not (consoleplayer.powers[pw_underwater] or consoleplayer.powers[pw_spacetime])) return MM.shwdwn end
 
-	if ((old == "SUSNCE") and (leveltime) and not (consoleplayer.powers[pw_underwater] or consoleplayer.powers[pw_spacetime])) return "SUSNCE" end
+	--Suspence music
+	if ((gamestate == GS_LEVEL) and (old == "SUSNCE") and (leveltime) and not (consoleplayer.powers[pw_underwater] or consoleplayer.powers[pw_spacetime])) return "SUSNCE" end
 
 	--Intermission theme
 	if (new == "_inter")