diff --git a/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_BeantwoordVraag.xml b/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_BeantwoordVraag.xml
index 675b3c1f..2f643cb9 100644
--- a/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_BeantwoordVraag.xml
+++ b/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_BeantwoordVraag.xml
@@ -11,6 +11,11 @@
             <JavaListener name="${zaakbrug.java.proxy.beantwoord-vraag.endpoint}"/>
         </Receiver>
 
+        <Receiver name="SoapEndpointProxy_BeantwoordVraag_Java_withErrorStore">
+            <JavaListener name="${zaakbrug.java.proxy.beantwoord-vraag.endpoint}_withErrorStore"/>
+            <JdbcErrorStorage name="SoapEndpointProxy_BeantwoordVraag_ErrorStore" slotId="${instance.name}/SoapEndpointProxy_BeantwoordVraag_ErrorStore" tableName="IBISSTORE"/>
+        </Receiver>
+
         <Pipeline>
             <Exits>
                 <Exit name="EXIT" state="SUCCESS"/>
diff --git a/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_OntvangAsynchroon.xml b/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_OntvangAsynchroon.xml
index d7e52225..d33e38f7 100644
--- a/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_OntvangAsynchroon.xml
+++ b/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_OntvangAsynchroon.xml
@@ -11,6 +11,11 @@
             <JavaListener name="${zaakbrug.java.proxy.ontvang-asynchroon.endpoint}"/>
         </Receiver>
 
+        <Receiver name="SoapEndpointProxy_OntvangAsynchroon_Java_withErrorStore">
+            <JavaListener name="${zaakbrug.java.proxy.ontvang-asynchroon.endpoint}_withErrorStore"/>
+            <JdbcErrorStorage name="SoapEndpointProxy_OntvangAsynchroon_ErrorStore" slotId="${instance.name}/SoapEndpointProxy_OntvangAsynchroon_ErrorStore" tableName="IBISSTORE"/>
+        </Receiver>
+
         <Pipeline>
             <Exits>
                 <Exit name="EXIT" state="SUCCESS"/>
diff --git a/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_VrijeBerichten.xml b/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_VrijeBerichten.xml
index e9a286f9..0382b9ce 100644
--- a/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_VrijeBerichten.xml
+++ b/src/main/configurations/Proxy/Configuration_SoapEndpointProxy_VrijeBerichten.xml
@@ -11,6 +11,11 @@
             <JavaListener name="${zaakbrug.java.proxy.vrije-berichten.endpoint}"/>
         </Receiver>
 
+        <Receiver name="SoapEndpointProxy_VrijeBerichten_Java_withErrorStore">
+            <JavaListener name="${zaakbrug.java.proxy.vrije-berichten.endpoint}_withErrorStore"/>
+            <JdbcErrorStorage name="SoapEndpointProxy_VrijeBerichten_ErrorStore" slotId="${instance.name}/SoapEndpointProxy_VrijeBerichten_ErrorStore" tableName="IBISSTORE"/>
+        </Receiver>
+
         <Pipeline>
             <Exits>
                 <Exit name="EXIT" state="SUCCESS"/>
diff --git a/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_BeantwoordVraag.xml b/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_BeantwoordVraag.xml
index 0c3a9d91..3da668e5 100644
--- a/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_BeantwoordVraag.xml
+++ b/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_BeantwoordVraag.xml
@@ -40,16 +40,27 @@
                         returnedSessionKeys="exitState">
                     <Param name="SOAPAction" sessionKey="SOAPAction"/>
                 </IbisLocalSender>
-                <Forward name="success" path="SendToProxy" />
+                <Forward name="success" path="CheckIfShouldUseErrorStore" />
                 <Forward name="500" path="CheckIfShouldSendToProxyAnyways" />
                 <Forward name="exception" path="CheckIfShouldSendToProxyAnyways" />
             </SenderPipe>
 
             <IfPipe name="CheckIfShouldSendToProxyAnyways" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="false">
-                <Forward name="then" path="SendToProxy"/>
+                <Forward name="then" path="CheckIfShouldUseErrorStore"/>
                 <Forward name="else" path="EchoTranslateResponse"/>
             </IfPipe>
 
+            <IfPipe name="CheckIfShouldUseErrorStore" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="true">
+                <Forward name="then" path="SendToProxyWithErrorStore"/>
+                <Forward name="else" path="SendToProxy"/>
+            </IfPipe>
+
+            <SenderPipe name="SendToProxyWithErrorStore">
+                <IbisLocalSender name="SendToProxySender" javaListener="${zaakbrug.java.proxy.beantwoord-vraag.endpoint}_withErrorStore" synchronous="false">
+                    <Param name="SOAPAction" sessionKey="SOAPAction"/>
+                </IbisLocalSender>
+            </SenderPipe>
+
             <SenderPipe name="SendToProxy">
 <!--                <FrankSender name="SendToProxySender" target="Proxy/SoapEndpointProxy_BeantwoordVraag" synchronous="false">-->
 <!--                    <Param name="SOAPAction" sessionKey="SOAPAction"/>-->
diff --git a/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_OntvangAsynchroon.xml b/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_OntvangAsynchroon.xml
index ef23a045..a6f527c8 100644
--- a/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_OntvangAsynchroon.xml
+++ b/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_OntvangAsynchroon.xml
@@ -46,10 +46,21 @@
             </SenderPipe>
 
             <IfPipe name="CheckIfShouldSendToProxyAnyways" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="false">
-                <Forward name="then" path="SendToProxy"/>
+                <Forward name="then" path="CheckIfShouldUseErrorStore"/>
                 <Forward name="else" path="EchoTranslateResponse"/>
             </IfPipe>
 
+            <IfPipe name="CheckIfShouldUseErrorStore" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="true">
+                <Forward name="then" path="SendToProxyWithErrorStore"/>
+                <Forward name="else" path="SendToProxy"/>
+            </IfPipe>
+
+            <SenderPipe name="SendToProxyWithErrorStore">
+                <IbisLocalSender name="SendToProxySender" javaListener="${zaakbrug.java.proxy.ontvang-asynchroon.endpoint}_withErrorStore" synchronous="false">
+                    <Param name="SOAPAction" sessionKey="SOAPAction"/>
+                </IbisLocalSender>
+            </SenderPipe>
+
             <SenderPipe name="SendToProxy">
                 <!--                <FrankSender name="SendToProxySender" target="Proxy/SoapEndpointProxy_OntvangAsynchroon" synchronous="false">-->
                 <!--                    <Param name="SOAPAction" sessionKey="SOAPAction"/>-->
diff --git a/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_VrijeBerichten.xml b/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_VrijeBerichten.xml
index 92aa50eb..af00fdc3 100644
--- a/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_VrijeBerichten.xml
+++ b/src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_VrijeBerichten.xml
@@ -46,10 +46,12 @@
             </SenderPipe>
 
             <IfPipe name="CheckIfShouldSendToProxyAnyways" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="false">
-                <Forward name="then" path="SendToProxy"/>
+                <Forward name="then" path="CheckIfShouldUseErrorStore"/>
                 <Forward name="else" path="EchoTranslateResponse"/>
             </IfPipe>
 
+            <!--If this is an orchestration scenario (stopOnError=true), then we should not send genereerZaak- and document-Identificatie messages to proxy,
+            because it will result in multiple ids for the same message. In all other cases, send to proxy, because this pipe is only reached if translate was succesful-->
             <IfPipe name="CheckIfReplicateAllowed"
                     preserveInput="true"
                     xpathExpression="$stopOnError = 'true' and $fromSoapAction = ['genereerZaakIdentificatie_Di02', 'genereerDocumentIdentificatie_Di02']"
@@ -58,10 +60,21 @@
                     <Param name="SOAPAction" sessionKey="SOAPAction"/>
                 </Param>
                 <Param name="stopOnError" sessionKey="stopOnError"/>
-                <Forward name="then" path="SendToProxy"/>
+                <Forward name="then" path="CheckIfShouldUseErrorStore"/>
                 <Forward name="else" path="EchoTranslateResponse"/>
             </IfPipe>
 
+            <IfPipe name="CheckIfShouldUseErrorStore" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="true">
+                <Forward name="then" path="SendToProxyWithErrorStore"/>
+                <Forward name="else" path="SendToProxy"/>
+            </IfPipe>
+
+            <SenderPipe name="SendToProxyWithErrorStore">
+                <IbisLocalSender name="SendToProxySender" javaListener="${zaakbrug.java.proxy.vrije-berichten.endpoint}_withErrorStore" synchronous="false">
+                    <Param name="SOAPAction" sessionKey="SOAPAction"/>
+                </IbisLocalSender>
+            </SenderPipe>
+
             <SenderPipe name="SendToProxy">
                 <!--                <FrankSender name="SendToProxySender" target="Proxy/SoapEndpointProxy_VrijeBerichten" synchronous="false">-->
                 <!--                    <Param name="SOAPAction" sessionKey="SOAPAction"/>-->