diff --git a/waku-messages/message/waku-message.bpmn b/waku-messages/message/waku-message.bpmn
index e50a1535..fa5a4410 100644
--- a/waku-messages/message/waku-message.bpmn
+++ b/waku-messages/message/waku-message.bpmn
@@ -80,6 +80,9 @@ waku_message = waku_message_body + waku_message_timestamp + waku_message_variabl
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Waku_Messages_Message">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="152" y="292" width="36" height="36" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0vm75gb_di" bpmnElement="Activity_0xuhps4">
         <dc:Bounds x="270" y="270" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -126,9 +129,6 @@ waku_message = waku_message_body + waku_message_timestamp + waku_message_variabl
         <dc:Bounds x="920" y="134" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="152" y="292" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1b2tmcm_di" bpmnElement="Flow_1b2tmcm">
         <di:waypoint x="1320" y="174" />
         <di:waypoint x="1385" y="174" />
@@ -182,7 +182,7 @@ waku_message = waku_message_body + waku_message_timestamp + waku_message_variabl
         <di:waypoint x="690" y="310" />
         <di:waypoint x="720" y="310" />
         <di:waypoint x="720" y="174" />
-        <di:waypoint x="740" y="174" />
+        <di:waypoint x="750" y="174" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>