diff --git a/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php b/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
index 99e5f558d3..1cb7864fe8 100644
--- a/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
+++ b/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
@@ -149,6 +149,9 @@ protected function updateModeratedEntity($moderation_state_id) {
 
     /** @var \Drupal\content_moderation\ModerationInformationInterface $content_moderation_info */
     $content_moderation_info = \Drupal::service('content_moderation.moderation_information');
+    if (!$content_moderation_info->isModeratedEntity($entity)) {
+      return;
+    }
     $workflow = $content_moderation_info->getWorkflowForEntity($entity);
 
     // Change the entity's default revision flag and the publishing status only