What does this PR do?

• Fixes #16797
• Fixes CAL-1679 (Linear issue number - should be visible at the bottom of the GitHub issue description) /claim #16797

https://www.loom.com/share/6147b80f849d4afb8e4882b3d380a5f8

Mandatory Tasks (DO NOT REMOVE)

• I have self-reviewed the code (A decent size PR without self-review might be rejected).
• I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
• I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

• Are there environment variables that should be set?
• What are the minimal test data to have?
• What is expected (happy path) to have (input and output)?
• Any other important info that could help to test that PR

Checklist

• I haven’t read the contributing guide
• My code doesn’t follow the style guidelines of this project
• I haven’t commented my code, particularly in hard-to-understand areas
• I haven’t checked if my changes generate no new warnings