i believe this has been fixed in the upstream shim-15.7 release: https://github.com/rhboot/shim/commit/4d64389c6c941d21548b06423b8131c872e3c3c7