Issue #1989100 by DamienMcKenna: Always include the entity_id when updating records.