diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
index ecda7d3bf..9bb35e77f 100644
--- a/source/MainMenuState.hx
+++ b/source/MainMenuState.hx
@@ -95,7 +95,7 @@ class MainMenuState extends MusicBeatState
 
 	override function update(elapsed:Float)
 	{
-		if (FlxG.sound.music.volume < 1)
+		if (FlxG.sound.music.volume < 0.8)
 		{
 			FlxG.sound.music.volume += 0.5 * FlxG.elapsed;
 		}
diff --git a/source/PlayState.hx b/source/PlayState.hx
index eb1380261..8240a064c 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -576,7 +576,7 @@ class PlayState extends MusicBeatState
 	{
 		if (paused)
 		{
-			if (FlxG.sound.music != null)
+			if (FlxG.sound.music != null && !startingSong)
 			{
 				FlxG.sound.music.play();
 				Conductor.songPosition = FlxG.sound.music.time;