Stop saving the entity twice

Closes #3614627

Merge request reports

Loading