diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index f3bb1b5314..5f7174cc0e 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -381,19 +381,21 @@ function editor_entity_update(EntityInterface $entity) {
   // File references that existed both in the previous version of the revision
   // and in the new one don't need their usage to be updated.
   else {
-    $original_uuids_by_field = _editor_get_file_uuids_by_field($entity->original);
-    $uuids_by_field = _editor_get_file_uuids_by_field($entity);
-
-    // Detect file usages that should be incremented.
-    foreach ($uuids_by_field as $field => $uuids) {
-      $added_files = array_diff($uuids_by_field[$field], $original_uuids_by_field[$field]);
-      _editor_record_file_usage($added_files, $entity);
-    }
+    if (!empty($entity->original)) {
+      $original_uuids_by_field = _editor_get_file_uuids_by_field($entity->original);
+      $uuids_by_field = _editor_get_file_uuids_by_field($entity);
+
+      // Detect file usages that should be incremented.
+      foreach ($uuids_by_field as $field => $uuids) {
+        $added_files = array_diff($uuids_by_field[$field], $original_uuids_by_field[$field]);
+        _editor_record_file_usage($added_files, $entity);
+      }
 
-    // Detect file usages that should be decremented.
-    foreach ($original_uuids_by_field as $field => $uuids) {
-      $removed_files = array_diff($original_uuids_by_field[$field], $uuids_by_field[$field]);
-      _editor_delete_file_usage($removed_files, $entity, 1);
+      // Detect file usages that should be decremented.
+      foreach ($original_uuids_by_field as $field => $uuids) {
+        $removed_files = array_diff($original_uuids_by_field[$field], $uuids_by_field[$field]);
+        _editor_delete_file_usage($removed_files, $entity, 1);
+      }
     }
   }
 }