Dileep | Avoiding multiple save on entity

Feel free to revert if necessary