diff --git a/lib/public/components/Filters/common/FilteringModel.js b/lib/public/components/Filters/common/FilteringModel.js
index e937786456..828fe55bed 100644
--- a/lib/public/components/Filters/common/FilteringModel.js
+++ b/lib/public/components/Filters/common/FilteringModel.js
@@ -12,6 +12,8 @@
  */
 
 import { expandQueryLikeNestedKey } from '../../../utilities/expandNestedKey.js';
+import { SelectionModel } from '../../common/selection/SelectionModel.js';
+import { FilterModel } from './FilterModel.js';
 import { Observable } from '/js/src/index.js';
 
 /**
@@ -28,12 +30,9 @@ export class FilteringModel extends Observable {
 
         this._visualChange$ = new Observable();
 
-        this._filters = filters;
-        this._filterModels = Object.values(filters);
-        for (const model of this._filterModels) {
-            model.bubbleTo(this);
-            model.visualChange$?.bubbleTo(this._visualChange$);
-        }
+        this._filters = {};
+        this._filterModels = [];
+        Object.entries(filters).forEach(([key, model]) => this.put(key, model));
     }
 
     /**
@@ -118,6 +117,10 @@ export class FilteringModel extends Observable {
             return;
         }
 
+        if (!(filter instanceof FilterModel || filter instanceof SelectionModel)) {
+            throw new Error('Filter must extend FilterModel or SelectionModel');
+        }
+
         this._filters[key] = filter;
         this._filterModels.push(filter);
         filter.bubbleTo(this);