- Prevent entity loading causing async lookups (#7553)