diff --git a/assets b/assets
index 8378b838b..590db1448 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 8378b838bae80739eacd9a0316f9b49f888185f6
+Subproject commit 590db1448fb132a29160540b4656b2474f22f727
diff --git a/source/funkin/InitState.hx b/source/funkin/InitState.hx
index 23bc255f1..4e6f12eed 100644
--- a/source/funkin/InitState.hx
+++ b/source/funkin/InitState.hx
@@ -240,7 +240,7 @@ class InitState extends FlxState
     #elseif LEVEL // -DLEVEL=week1 -DDIFFICULTY=hard
     startLevel(defineLevel(), defineDifficulty());
     #elseif FREEPLAY // -DFREEPLAY
-    FlxG.switchState(new FreeplayState());
+    FlxG.switchState(new funkin.ui.freeplay.FreeplayState());
     #elseif ANIMATE // -DANIMATE
     FlxG.switchState(new funkin.ui.debug.anim.FlxAnimateTest());
     #elseif WAVEFORM // -DWAVEFORM
diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index b23ca6e54..3c6b52c6f 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -164,9 +164,9 @@ class FreeplayState extends MusicBeatSubState
     isDebug = true;
     #end
 
-    if (FlxG.sound.music != null)
+    if (FlxG.sound.music == null || (FlxG.sound.music != null && !FlxG.sound.music.playing))
     {
-      if (!FlxG.sound.music.playing) FlxG.sound.playMusic(Paths.music('freakyMenu/freakyMenu'));
+      FlxG.sound.playMusic(Paths.music('freakyMenu/freakyMenu'));
     }
 
     // Add a null entry that represents the RANDOM option