diff --git a/src/lib/Data/Mapper/ContentUpdateMapper.php b/src/lib/Data/Mapper/ContentUpdateMapper.php
index c3f905c7..88729e6d 100644
--- a/src/lib/Data/Mapper/ContentUpdateMapper.php
+++ b/src/lib/Data/Mapper/ContentUpdateMapper.php
@@ -45,7 +45,7 @@ public function mapToFormData(ValueObject $contentDraft, array $params = [])
             $data->addFieldData(new FieldData([
                 'fieldDefinition' => $fieldDef,
                 'field' => $field,
-                'value' => $isNonTranslatable
+                'value' => $isNonTranslatable && isset($mappedCurrentFields[$fieldDef->identifier])
                     ? $mappedCurrentFields[$fieldDef->identifier]->value
                     : $field->value,
             ]));