fix: #3618942 fix for non bundle entity types

Christian Adamskirequested to merge
issue/geolocation-3618942:3618942-fix-for-non into 4.x

By: slasher13

Closes #3618942

Merge request reports