Fixes #4688

Or attempts to at least.
Merge pull request #5394 from mwerezak/air-alarm-fix

Fixes #4688
Merge remote-tracking branch 'upstream/master'