fix: Fix unit null rank

[ritchie46]

fixes #18243
fixes #17570

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.24%. Comparing base (bf82f3d) to head (eacab38).
Report is 2 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main   #18252   +/-   ##
=======================================
  Coverage   80.23%   80.24%           
=======================================
  Files        1500     1500           
  Lines      198881   198889    +8     
  Branches     2837     2837           
=======================================
+ Hits       159577   159592   +15     
+ Misses      38777    38770    -7     
  Partials      527      527           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.