Fix EZP-23499: Regression from #1094 commit cc73a1c576807add861f557e53771a2bd09c64c4