Fix ATLASSIM-6723

Beojan Stanislausrequested to merge
bstanisl/athena:ticket-6723 into main

Fix ATLASSIM-6723. Follow-up to !65091 (merged).

Edited by John Derek Chapman

Merge request reports