diff --git a/x-pack/plugins/lens/public/shared_components/debounced_value.ts b/x-pack/plugins/lens/public/shared_components/debounced_value.ts
index 5525f6b16b31..54696e672ccb 100644
--- a/x-pack/plugins/lens/public/shared_components/debounced_value.ts
+++ b/x-pack/plugins/lens/public/shared_components/debounced_value.ts
@@ -30,12 +30,20 @@ export const useDebouncedValue = <T>(
   // Save the initial value
   const initialValue = useRef(value);
 
+  const flushChangesTimeout = useRef<NodeJS.Timeout | undefined>();
+
   const onChangeDebounced = useMemo(() => {
     const callback = debounce((val: T) => {
       onChange(val);
-      unflushedChanges.current = false;
+      // do not reset unflushed flag right away, wait a bit for upstream to pick it up
+      flushChangesTimeout.current = setTimeout(() => {
+        unflushedChanges.current = false;
+      }, 256);
     }, 256);
     return (val: T) => {
+      if (flushChangesTimeout.current) {
+        clearTimeout(flushChangesTimeout.current);
+      }
       unflushedChanges.current = true;
       callback(val);
     };