diff --git a/waku-messages/message/waku-message.bpmn b/waku-messages/message/waku-message.bpmn
index b8bf4e4f..18ac5190 100644
--- a/waku-messages/message/waku-message.bpmn
+++ b/waku-messages/message/waku-message.bpmn
@@ -60,7 +60,9 @@ waku_message = waku_message_body + "\n- - - - - - - - - - - - - - - - - - - - -
       <bpmn:outgoing>Flow_1lxrn9n</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="Flow_1lxrn9n" sourceRef="Gateway_1szvllt" targetRef="Event_0hgb9d6" />
-    <bpmn:sequenceFlow id="Flow_1ypunfo" sourceRef="Gateway_0quuycl" targetRef="Gateway_1szvllt" />
+    <bpmn:sequenceFlow id="Flow_1ypunfo" name="No" sourceRef="Gateway_0quuycl" targetRef="Gateway_1szvllt">
+      <bpmn:conditionExpression>not(isSetMessage)</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Waku_Messages_Message">
@@ -142,6 +144,9 @@ waku_message = waku_message_body + "\n- - - - - - - - - - - - - - - - - - - - -
         <di:waypoint x="920" y="100" />
         <di:waypoint x="1210" y="100" />
         <di:waypoint x="1210" y="149" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1058" y="82" width="15" height="14" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>