diff --git a/application/forms/ImportRowModifierForm.php b/application/forms/ImportRowModifierForm.php
index 7033f4c12..a9fdcf1a2 100644
--- a/application/forms/ImportRowModifierForm.php
+++ b/application/forms/ImportRowModifierForm.php
@@ -214,4 +214,13 @@ public function setSource(ImportSource $source)
 
         return $this;
     }
+
+    public function onSuccess()
+    {
+        if ($this->getValue('use_filter') === 'n') {
+            $this->getObject()->set('filter_expression', null);
+        }
+
+        parent::onSuccess();
+    }
 }