diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index b699bb2f90..7af5cbbe9a 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -31,6 +31,7 @@
                   :class="{ 'is-enabled': !domainObject.isDefault }"
                   :draggable="!domainObject.isDefault"
                   @dragstart="dragStart"
+                  @dragstop="dragStop"
                   @dragover.stop
             ></span>
             <span
@@ -241,10 +242,14 @@ export default {
             this.domainObject.configuration.criteria.push(criteriaObject);
         },
         dragStart(e) {
+            e.dataTransfer.setData('dragging', e.target); // required for FF to initiate drag
             e.dataTransfer.effectAllowed = "copyMove";
             e.dataTransfer.setDragImage(e.target.closest('.c-c-container__container'), 0, 0);
             this.$emit('setMoveIndex', this.conditionIndex);
         },
+        dragStop(e) {
+            e.dataTransfer.clearData();
+        },
         destroy() {
         },
         removeCondition(ev) {