diff --git a/lib/features/modeling/behavior/DataStoreBehavior.js b/lib/features/modeling/behavior/DataStoreBehavior.js
index 74242e56..8689d2ad 100644
--- a/lib/features/modeling/behavior/DataStoreBehavior.js
+++ b/lib/features/modeling/behavior/DataStoreBehavior.js
@@ -144,7 +144,9 @@ export default function DataStoreBehavior(
         .filter(function(dataStore) {
           return isDescendant(dataStore, shape);
         })
-        .forEach(updateDataStoreParent);
+        .forEach(function(dataStore) {
+          updateDataStoreParent(dataStore);
+        });
     }
   });
 
diff --git a/test/spec/features/modeling/behavior/DataStoreBehavior.remove-participant.bpmn b/test/spec/features/modeling/behavior/DataStoreBehavior.remove-participant.bpmn
index df7905dc..48576bc7 100644
--- a/test/spec/features/modeling/behavior/DataStoreBehavior.remove-participant.bpmn
+++ b/test/spec/features/modeling/behavior/DataStoreBehavior.remove-participant.bpmn
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.15.0-dev" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.17.0-dev" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn:collaboration id="Collaboration">
     <bpmn:participant id="Participant" processRef="Process" />
     <bpmn:participant id="Participant_2" processRef="Process_2" />
   </bpmn:collaboration>
   <bpmn:process id="Process" isExecutable="false">
     <bpmn:dataStoreReference id="DataStoreReference" />
+    <bpmn:dataStoreReference id="DataStoreReference_2" />
   </bpmn:process>
   <bpmn:process id="Process_2" isExecutable="false" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
@@ -22,6 +23,9 @@
       <bpmndi:BPMNShape id="Participant_066vvzt_di" bpmnElement="Participant_2">
         <dc:Bounds x="50" y="500" width="600" height="250" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DataStoreReference_2_di" bpmnElement="DataStoreReference_2">
+        <dc:Bounds x="128" y="375" width="50" height="50" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>