diff -u b/src/Entity/Flagging.php b/src/Entity/Flagging.php
--- b/src/Entity/Flagging.php
+++ b/src/Entity/Flagging.php
@@ -182,8 +182,9 @@
    */
   protected function setFlaggedEntity() {
     $flagged_entity_item_list = $this->get('flagged_entity');
-    if ($flagged_entity_item_list->isEmpty() || $flagged_entity_item_list->target_id != $this->entity_id->value) {
-      $flagged_entity_item_list->target_id = $this->entity_id->value;
+    $entity_id_item_list = $this->get('entity_id');
+    if ($flagged_entity_item_list->isEmpty() != $entity_id_item_list->isEmpty() || $flagged_entity_item_list->target_id != $entity_id_item_list->value) {
+      $flagged_entity_item_list->target_id = $entity_id_item_list->value;
     }
   }