diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php
index 0b7c6af..7e823c3 100644
--- a/core/modules/filter/src/Entity/FilterFormat.php
+++ b/core/modules/filter/src/Entity/FilterFormat.php
@@ -191,6 +191,11 @@ public function preSave(EntityStorageInterface $storage) {
     // Ensure the filters have been sorted before saving.
     $this->filters()->sort();
 
+    // Remove disabled filters.
+    $this->filters = array_filter($this->filters, function ($filter) {
+      return $filter['status'] == TRUE;
+    });
+
     parent::preSave($storage);
 
     $this->name = trim($this->label());