[6.x] Fix calculation of current state#14080

christophstockinger wants to merge 2 commits intostatamic:6.xstatamic/cms:6.xfrom

christophstockinger:cs/#13341christophstockinger/statamic-cms:cs/#13341Copy head branch name to clipboard