diff --git a/source/funkin/backend/system/Conductor.hx b/source/funkin/backend/system/Conductor.hx index 3282dd8e..8e975522 100644 --- a/source/funkin/backend/system/Conductor.hx +++ b/source/funkin/backend/system/Conductor.hx @@ -83,7 +83,7 @@ final class Conductor */ public static var bpm(get, never):Float; private static function get_bpm() - return curChangeIndex == 0 ? startingBPM : getTimeWithIndexInBPM(songPosition, curChangeIndex); + return (curChangeIndex == 0 || bpmChange.length == 0) ? startingBPM : getTimeWithIndexInBPM(songPosition, curChangeIndex); /** * Starting BPM