diff --git a/src/lib/Data/Mapper/ContentUpdateMapper.php b/src/lib/Data/Mapper/ContentUpdateMapper.php
index ac7b1e5d..8cbc9d2f 100644
--- a/src/lib/Data/Mapper/ContentUpdateMapper.php
+++ b/src/lib/Data/Mapper/ContentUpdateMapper.php
@@ -42,6 +42,9 @@ public function mapToFormData(ValueObject $contentDraft, array $params = [])
 
         foreach ($params['contentType']->fieldDefinitions as $fieldDef) {
             $isNonTranslatable = $fieldDef->isTranslatable === false;
+            if (!isset($fields[$fieldDef->identifier])) {
+                continue;
+            }
             $field = $fields[$fieldDef->identifier];
             $shouldUseCurrentFieldValue = $isNonTranslatable
                 && isset($mappedCurrentFields[$fieldDef->identifier])