Unreleased bug fix for https://github.com/fleetdm/fleet/pull/42063
**Related issue:** Resolves#39900
## Testing
- [x] Added/updated automated tests
- [x] QA'd all new/changed functionality manually
For unreleased bug fixes in a release candidate, one of:
- [x] Confirmed that the fix is not expected to adversely impact load
test results
- [x] Alerted the release DRI if additional load testing is needed
We shouldn't need any additional load testing. This change will not have
a large impact on load.
Konstantin Sykulev
c8e9610dd2