diff --git a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts
index d0cd7fa8fe..989e272b88 100644
--- a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts
+++ b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts
@@ -95,7 +95,9 @@ export class SearchCheckListComponent implements SearchWidget, OnInit {
         this.clearOptions();
         if (this.id && this.context) {
             this.updateDisplayValue();
-            this.context.update();
+            if (!this.disableUpdateOnSubmit) {
+                this.context.update();
+            }
         }
     }
 
diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced/search-date-range-advanced.component.ts b/lib/content-services/src/lib/search/components/search-date-range-advanced/search-date-range-advanced.component.ts
index 16e974c3f3..bc175d0630 100644
--- a/lib/content-services/src/lib/search/components/search-date-range-advanced/search-date-range-advanced.component.ts
+++ b/lib/content-services/src/lib/search/components/search-date-range-advanced/search-date-range-advanced.component.ts
@@ -68,7 +68,6 @@ export class SearchDateRangeAdvancedComponent implements SearchWidget, OnInit, O
     DateRangeType = DateRangeType;
     InLastDateType = InLastDateType;
 
-    private enableChangeUpdate: boolean;
     private datePickerFormat: string;
 
     private onDestroy$ = new Subject<void>();
@@ -87,7 +86,6 @@ export class SearchDateRangeAdvancedComponent implements SearchWidget, OnInit, O
                 this.maxDate = moment(this.settings.maxDate).endOf('day');
             }
         }
-        this.enableChangeUpdate = this.settings?.allowUpdateOnChange ?? true;
 
         this.userPreferencesService
             .select(UserPreferenceValues.Locale)
@@ -164,7 +162,7 @@ export class SearchDateRangeAdvancedComponent implements SearchWidget, OnInit, O
 
         if (this.id && this.context) {
             this.context.queryFragments[this.id] = '';
-            if (this.enableChangeUpdate) {
+            if (!this.disableUpdateOnSubmit) {
                 this.updateQuery();
             }
         }
diff --git a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts
index c454b69e33..be6e56008a 100644
--- a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts
+++ b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts
@@ -217,7 +217,9 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit, OnDestroy
     private updateQuery() {
         if (this.id && this.context) {
             this.updateDisplayValue();
-            this.context.update();
+            if (!this.disableUpdateOnSubmit) {
+                this.context.update();
+            }
         }
     }
 
diff --git a/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts b/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts
index 268f5443f5..1fd12ce231 100644
--- a/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts
+++ b/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts
@@ -205,7 +205,9 @@ export class SearchDatetimeRangeComponent implements SearchWidget, OnInit, OnDes
     private updateQuery() {
         if (this.id && this.context) {
             this.updateDisplayValue();
-            this.context.update();
+            if (!this.disableUpdateOnSubmit) {
+                this.context.update();
+            }
         }
     }
 
diff --git a/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts b/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts
index cd792f9627..c371d0531f 100644
--- a/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts
+++ b/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts
@@ -161,8 +161,10 @@ export class SearchNumberRangeComponent implements SearchWidget, OnInit {
 
     reset() {
         this.clear();
-        if (this.id && this.context) {
-            this.context.update();
+        if (!this.disableUpdateOnSubmit) {
+            if (this.id && this.context) {
+                this.context.update();
+            }
         }
     }
 }
diff --git a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts
index 3a27a068b4..ff8c10c184 100644
--- a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts
+++ b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts
@@ -147,7 +147,9 @@ export class SearchRadioComponent implements SearchWidget, OnInit {
         if (initialValue !== null) {
             this.setValue(initialValue);
             this.updateDisplayValue();
-            this.context.update();
+            if (!this.disableUpdateOnSubmit) {
+                this.context.update();
+            }
         }
     }
 }
diff --git a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts
index 9aca24539b..756998a3c6 100644
--- a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts
+++ b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts
@@ -117,7 +117,9 @@ export class SearchSliderComponent implements SearchWidget, OnInit {
             } else {
                 this.context.queryFragments[this.id] = `${this.settings.field}:[0 TO ${value}]`;
             }
-            this.context.update();
+            if (!this.disableUpdateOnSubmit) {
+                this.context.update();
+            }
         }
     }
 
diff --git a/lib/content-services/src/lib/search/components/search-text/search-text.component.ts b/lib/content-services/src/lib/search/components/search-text/search-text.component.ts
index ac9fef40a0..1884359775 100644
--- a/lib/content-services/src/lib/search/components/search-text/search-text.component.ts
+++ b/lib/content-services/src/lib/search/components/search-text/search-text.component.ts
@@ -87,7 +87,9 @@ export class SearchTextComponent implements SearchWidget, OnInit {
         this.displayValue$.next(value);
         if (this.context && this.settings && this.settings.field) {
             this.context.queryFragments[this.id] = value ? `${this.settings.field}:'${this.getSearchPrefix()}${value}${this.getSearchSuffix()}'` : '';
-            this.context.update();
+            if (!this.disableUpdateOnSubmit) {
+                this.context.update();
+            }
         }
     }