diff --git a/core/modules/content_moderation/src/EntityOperations.php b/core/modules/content_moderation/src/EntityOperations.php
index e2688601df5a77c9778dc95d78ef29828a63ec20..240fd6a5040547ee8b97174c1a816e1a6f836fe1 100644
--- a/core/modules/content_moderation/src/EntityOperations.php
+++ b/core/modules/content_moderation/src/EntityOperations.php
@@ -203,7 +203,6 @@ protected function updateOrCreateFromEntity(EntityInterface $entity) {
       $moderation_state = $workflow->getTypePlugin()->getInitialState($entity)->id();
     }
 
-    // @todo what if $entity->moderation_state is null at this point?
     $content_moderation_state->set('content_entity_revision_id', $entity_revision_id);
     $content_moderation_state->set('moderation_state', $moderation_state);
     ContentModerationStateEntity::updateOrCreateFromEntity($content_moderation_state);
diff --git a/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php b/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
index ce78aa9063316fd7fac9130c685d77c72b1c0ff2..c45f1f9e2baca2395e4e81342d87194c0217deac 100644
--- a/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
@@ -111,6 +111,9 @@ public function testSetEmptyState() {
 
     unset($this->testNode->moderation_state);
     $this->assertEquals('draft', $this->testNode->moderation_state->value);
+
+    $this->testNode->moderation_state = NULL;
+    $this->assertEquals('draft', $this->testNode->moderation_state->value);
   }
 
   /**