LPS-27013

cc rotty3000 We'll sort out the permission check and it's potential performance impact in another ticket since it was discovered while fixing this issue. This still fixes the original issue without resorting to permission check.