fix: #3618942 fix for non bundle entity types

By: slasher13

Closes #3618942

Merge request reports

Loading