diff --git a/src/assets/default-flow.svg b/src/assets/default-flow.svg
new file mode 100644
index 000000000..da950ef7b
--- /dev/null
+++ b/src/assets/default-flow.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+  version="1.1" width="16px" height="20px" viewBox="7 7 16 20">
+	<defs />
+	<g>
+		<path d="M 7 27 L 17.93 13.34" fill="none" stroke="#ffffff" stroke-miterlimit="10" pointer-events="stroke" />
+		<path d="M 22.3 7.87 L 20.66 15.53 L 15.2 11.15 Z" fill="#ffffff" stroke="#ffffff" stroke-miterlimit="10" pointer-events="all" />
+		<path d="M 7 20 L 18 20" fill="none" stroke="#ffffff" stroke-miterlimit="10" pointer-events="stroke" />
+	</g>
+</svg>
diff --git a/src/components/crown/crownButtons/defaultFlowButton.vue b/src/components/crown/crownButtons/defaultFlowButton.vue
new file mode 100644
index 000000000..26e29d21f
--- /dev/null
+++ b/src/components/crown/crownButtons/defaultFlowButton.vue
@@ -0,0 +1,32 @@
+<template>
+  <crown-button
+    v-if="node.canBeDefaultFlow()"
+    :title="$t('Set as Default Flow')"
+    v-b-tooltip.hover.viewport.d50="{ customClass: 'no-pointer-events' }"
+    aria-label="Default Flow"
+    data-test="default-flow"
+    role="menuitem"
+    :src="icon"
+    @click="click"
+  />
+</template>
+
+<script>
+import CrownButton from '@/components/crown/crownButtons/crownButton';
+import icon from '@/assets/default-flow.svg';
+
+export default {
+  components: { CrownButton },
+  props: ['node'],
+  data() {
+    return {
+      icon,
+    };
+  },
+  methods: {
+    click() {
+      this.$emit('default-flow', this.node);
+    },
+  },
+};
+</script>
diff --git a/src/components/crown/crownConfig/crownConfig.vue b/src/components/crown/crownConfig/crownConfig.vue
index 8e6e4d340..6dda2880f 100644
--- a/src/components/crown/crownConfig/crownConfig.vue
+++ b/src/components/crown/crownConfig/crownConfig.vue
@@ -26,6 +26,11 @@
       @toggle-crown-state="showCrown = $event"
     />
 
+    <default-flow
+      :node="node"
+      v-on="$listeners"
+    />
+
     <crown-dropdowns
       :dropdown-data="dropdownData"
       :boundary-event-dropdown-data="boundaryEventDropdownData"
@@ -72,6 +77,7 @@ import SequenceFlowButton from '@/components/crown/crownButtons/sequenceFlowButt
 import AssociationFlowButton from '@/components/crown/crownButtons/associationFlowButton';
 import CopyButton from '@/components/crown/crownButtons/copyButton.vue';
 import CrownDropdowns from '@/components/crown/crownButtons/crownDropdowns';
+import DefaultFlow from '@/components/crown/crownButtons/defaultFlowButton.vue';
 import poolLaneCrownConfig from '@/mixins/poolLaneCrownConfig';
 import { removeFlows } from '@/components/crown/utils.js';
 import pull from 'lodash/pull';
@@ -87,6 +93,7 @@ export default {
     SequenceFlowButton,
     AssociationFlowButton,
     CopyButton,
+    DefaultFlow,
   },
   props: {
     highlighted: Boolean,
diff --git a/src/components/modeler/Modeler.vue b/src/components/modeler/Modeler.vue
index 8b1351d73..5693a7d17 100644
--- a/src/components/modeler/Modeler.vue
+++ b/src/components/modeler/Modeler.vue
@@ -96,6 +96,7 @@
         @setTooltip="tooltipTarget = $event"
         @replace-node="replaceNode"
         @copy-element="copyElement"
+        @default-flow="toggleDefaultFlow"
       />
     </b-row>
   </span>
@@ -250,6 +251,13 @@ export default {
     },
   },
   methods: {
+    toggleDefaultFlow(flow) {
+      const source = flow.definition.sourceRef;
+      if (source.default && source.default.id === flow.id) {
+        flow = null;
+      }
+      source.set('default', flow);
+    },
     copyElement(node, copyCount) {
       const clonedNode = node.clone(this.nodeRegistry, this.moddle, this.$t);
       const yOffset = (node.diagram.bounds.height + 30) * copyCount;
diff --git a/src/components/nodes/gateway/gateway.vue b/src/components/nodes/gateway/gateway.vue
index 391ca817a..37ae15679 100644
--- a/src/components/nodes/gateway/gateway.vue
+++ b/src/components/nodes/gateway/gateway.vue
@@ -42,6 +42,11 @@ export default {
     'isRendering',
   ],
   mixins: [highlightConfig, portsConfig, hideLabelOnDrag],
+  created() {
+    const flow = this.node.definition.default || null;
+    delete this.node.definition.default;
+    this.$set(this.node.definition, 'default', flow);
+  },
   data() {
     return {
       shape: null,
diff --git a/src/components/nodes/node.js b/src/components/nodes/node.js
index d32a288ac..2e8c0e109 100644
--- a/src/components/nodes/node.js
+++ b/src/components/nodes/node.js
@@ -25,6 +25,15 @@ export default class Node {
     return types.includes(this.definition.$type);
   }
 
+  canBeDefaultFlow() {
+    const validSources = [
+      'bpmn:ExclusiveGateway',
+      'bpmn:InclusiveGateway',
+    ];
+    return this.definition.$type === 'bpmn:SequenceFlow'
+      && validSources.includes(this.definition.sourceRef.$type);
+  }
+
   isType(type) {
     return this.type === type;
   }
diff --git a/src/components/nodes/sequenceFlow/sequenceFlow.vue b/src/components/nodes/sequenceFlow/sequenceFlow.vue
index 180f4881c..1d5fda8c8 100644
--- a/src/components/nodes/sequenceFlow/sequenceFlow.vue
+++ b/src/components/nodes/sequenceFlow/sequenceFlow.vue
@@ -77,11 +77,30 @@ export default {
         if (newNameLabel !== this.nameLabel) {
           this.nameLabel = newNameLabel;
         }
+        this.setDefaultMarker(this.isDefaultFlow());
+      },
+      deep: true,
+    },
+    'node.definition.sourceRef': {
+      handler() {
+        this.setDefaultMarker(this.isDefaultFlow());
       },
       deep: true,
     },
   },
   methods: {
+    setDefaultMarker(value) {
+      this.shape.attr('line', {
+        sourceMarker: {
+          'stroke-width': value ? 2 : 0,
+        },
+      });
+    },
+    isDefaultFlow() {
+      return this.node.definition.sourceRef
+        && this.node.definition.sourceRef.default
+        && this.node.definition.sourceRef.default.id === this.node.definition.id;
+    },
     updateRouter() {
       this.shape.router('orthogonal', { padding: 1 });
     },
@@ -137,11 +156,21 @@ export default {
         position: namePosition,
       }]);
     },
+    createDefaultFlowMarker() {
+      this.shape.attr('line', {
+        sourceMarker: {
+          'type': 'polyline',
+          'stroke-width': this.isDefaultFlow() ? 2 : 0,
+          points: '2,6 6,-6',
+        },
+      });
+    },
   },
   mounted() {
     this.shape = new shapes.standard.Link();
     this.shape.connector('rounded', { radius: 5 });
     this.createLabel();
+    this.createDefaultFlowMarker();
 
     this.shape.addTo(this.graph);
     this.shape.component = this;