diff --git a/src/Storage/Field/Collection/RepeatingFieldCollection.php b/src/Storage/Field/Collection/RepeatingFieldCollection.php
index <HASH>..<HASH> 100644
--- a/src/Storage/Field/Collection/RepeatingFieldCollection.php
+++ b/src/Storage/Field/Collection/RepeatingFieldCollection.php
@@ -122,7 +122,8 @@ class RepeatingFieldCollection extends ArrayCollection
             if (
                 $existing->getName() == $entity->getName() &&
                 $existing->getGrouping() == $entity->getGrouping() &&
-                $existing->getFieldname() == $entity->getFieldname()
+                $existing->getFieldname() == $entity->getFieldname() &&
+                (!$existing->getBlock() || $existing->getBlock() == $entity->getBlock())
             ) {
                 return $existing;
             }
add extra check to test block exists and matches