diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index 03eb12ead..9e0e15019 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -2149,8 +2149,14 @@ class FreeplaySongData
 
   function updateValues(variations:Array<String>):Void
   {
-    this.songDifficulties = song.listSuffixedDifficulties(variations, false, false);
-    if (!this.songDifficulties.contains(currentDifficulty)) currentDifficulty = Constants.DEFAULT_DIFFICULTY;
+    this.songDifficulties = song.listDifficulties(null, variations, false, false);
+    if (!this.songDifficulties.contains(currentDifficulty))
+    {
+      currentDifficulty = Constants.DEFAULT_DIFFICULTY;
+      // This method gets called again by the setter-method
+      // or the difficulty didn't change, so there's no need to continue.
+      return;
+    }
 
     var songDifficulty:SongDifficulty = song.getDifficulty(currentDifficulty, null, variations);
     if (songDifficulty == null) return;