diff --git a/main/src/application/unit_model.rs b/main/src/application/unit_model.rs
index 09491e0d8..fa365d150 100644
--- a/main/src/application/unit_model.rs
+++ b/main/src/application/unit_model.rs
@@ -1776,6 +1776,7 @@ impl UnitModel {
         self.unit
             .borrow_mut()
             .set_mapping_which_learns_source(Some(mapping_id));
+        let cloned_session = session.clone();
         when(
             self.incoming_msg_captured(
                 reenable_control_after_touched,
@@ -1797,9 +1798,7 @@ impl UnitModel {
                     .borrow()
                     .mapping_which_learns_source()
                     .changed_to(None),
-            )
-            // We listen to just one message!
-            .take(1),
+            ),
         )
         .with(session)
         .finally(|session| {
@@ -1822,6 +1821,10 @@ impl UnitModel {
                         Rc::downgrade(&shared_session),
                         |ctx| Ok(ctx.mapping.source_model.apply_from_source(&source)),
                     );
+                    session
+                        .unit
+                        .borrow_mut()
+                        .set_mapping_which_learns_source(None);
                 }
             }
         });
diff --git a/resources/main-presets/factory/faders-eq.json b/resources/main-presets/factory/faders-eq.json
deleted file mode 100644
index ab5ad4839..000000000
--- a/resources/main-presets/factory/faders-eq.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-  "version": "2.16.1",
-  "name": "Faders => EQ",
-  "defaultGroup": {},
-  "mappings": [
-    {
-      "id": "_lMShbSD1lHcQrkCpspG9",
-      "name": "1",
-      "source": {
-        "category": "virtual",
-        "isRegistered": false,
-        "is14Bit": false,
-        "oscArgIndex": 0
-      },
-      "mode": {
-        "maxStepSize": 0.05,
-        "minStepFactor": 1,
-        "maxStepFactor": 5
-      },
-      "target": {
-        "fxAnchor": "instance",
-        "useSelectionGanging": false,
-        "useTrackGrouping": false,
-        "paramIndex": 1,
-        "seekBehavior": "Immediate",
-        "useProject": true,
-        "moveView": true,
-        "seekPlay": true,
-        "oscArgIndex": 0,
-        "mouseAction": {
-          "kind": "MoveTo",
-          "axis": "X"
-        },
-        "takeMappingSnapshot": {
-          "kind": "LastLoaded"
-        }
-      }
-    },
-    {
-      "id": "14hpEkwmFEZeCvd8ZmdYL",
-      "name": "2",
-      "source": {
-        "category": "virtual",
-        "isRegistered": false,
-        "is14Bit": false,
-        "oscArgIndex": 0,
-        "controlElementIndex": 1
-      },
-      "mode": {
-        "maxStepSize": 0.05,
-        "minStepFactor": 1,
-        "maxStepFactor": 5
-      },
-      "target": {
-        "fxAnchor": "instance",
-        "useSelectionGanging": false,
-        "useTrackGrouping": false,
-        "paramIndex": 4,
-        "seekBehavior": "Immediate",
-        "useProject": true,
-        "moveView": true,
-        "seekPlay": true,
-        "oscArgIndex": 0,
-        "mouseAction": {
-          "kind": "MoveTo",
-          "axis": "X"
-        },
-        "takeMappingSnapshot": {
-          "kind": "LastLoaded"
-        }
-      }
-    },
-    {
-      "id": "HEgDs8r-E7uA26NjRZjL2",
-      "name": "3",
-      "source": {
-        "category": "virtual",
-        "isRegistered": false,
-        "is14Bit": false,
-        "oscArgIndex": 0,
-        "controlElementIndex": 2
-      },
-      "mode": {
-        "maxStepSize": 0.05,
-        "minStepFactor": 1,
-        "maxStepFactor": 5
-      },
-      "target": {
-        "fxAnchor": "instance",
-        "useSelectionGanging": false,
-        "useTrackGrouping": false,
-        "paramIndex": 7,
-        "seekBehavior": "Immediate",
-        "useProject": true,
-        "moveView": true,
-        "seekPlay": true,
-        "oscArgIndex": 0,
-        "mouseAction": {
-          "kind": "MoveTo",
-          "axis": "X"
-        },
-        "takeMappingSnapshot": {
-          "kind": "LastLoaded"
-        }
-      }
-    },
-    {
-      "id": "mMRSjmcWSk6v4BECrlAjP",
-      "name": "4",
-      "source": {
-        "category": "virtual",
-        "isRegistered": false,
-        "is14Bit": false,
-        "oscArgIndex": 0,
-        "controlElementIndex": 3
-      },
-      "mode": {
-        "maxStepSize": 0.05,
-        "minStepFactor": 1,
-        "maxStepFactor": 5
-      },
-      "target": {
-        "fxAnchor": "instance",
-        "useSelectionGanging": false,
-        "useTrackGrouping": false,
-        "paramIndex": 10,
-        "seekBehavior": "Immediate",
-        "useProject": true,
-        "moveView": true,
-        "seekPlay": true,
-        "oscArgIndex": 0,
-        "mouseAction": {
-          "kind": "MoveTo",
-          "axis": "X"
-        },
-        "takeMappingSnapshot": {
-          "kind": "LastLoaded"
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file