Fixes WSOD in D11

Justin Keiserrequested to merge
issue/ms_clarity-3509189:3509189-cannot-view-admin into 2.x

Closes #3509189

Merge request reports