ISSUE-145: Fixed entity id null