Fix #2710

[DavyLandman]

This is an extract of the actual fixes in #2713 such that we can debug the issue found in that PR without the typechecker changes in the mix

Fixes #2710

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 46%. Comparing base (cc9d610) to head (e20c77f).
⚠️ Report is 9 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##              main   #2725   +/-   ##
=======================================
  Coverage       46%     46%           
- Complexity    6680    6682    +2     
=======================================
  Files          795     795           
  Lines        65913   65916    +3     
  Branches      9883    9883           
=======================================
+ Hits         30718   30727    +9     
+ Misses       32814   32806    -8     
- Partials      2381    2383    +2     

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

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.