diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module
index a7fbb5d..7096bec 100644
--- a/core/modules/edit/edit.module
+++ b/core/modules/edit/edit.module
@@ -164,7 +164,12 @@ function edit_field_formatter_info_alter(&$info) {
 function edit_preprocess_field(&$variables) {
   $element = $variables['element'];
   $entity = $element['#object'];
-  $variables['attributes']['data-edit-id'] = $entity->entityType() . '/' . $entity->id() . '/' . $element['#field_name'] . '/' . $element['#language'] . '/' . $element['#view_mode'];
+
+  $property_defintions = $entity->getPropertyDefinitions();
+
+  if (isset($property_defintions[$element['#field_name']])) {
+    $variables['attributes']['data-edit-id'] = $entity->entityType() . '/' . $entity->id() . '/' . $element['#field_name'] . '/' . $element['#language'] . '/' . $element['#view_mode'];
+  }
 }
 
 /**