diff --git a/frontend/src/Editor/QueryManager/QueryManager.jsx b/frontend/src/Editor/QueryManager/QueryManager.jsx
index 3c264e60ee..af37985dcc 100644
--- a/frontend/src/Editor/QueryManager/QueryManager.jsx
+++ b/frontend/src/Editor/QueryManager/QueryManager.jsx
@@ -409,7 +409,7 @@ class QueryManagerComponent extends React.Component {
 
   // Clear the focus field value from options
   cleanFocusedFields = (newOptions) => {
-    const diffFields = diff(newOptions, this.defaultOptions.current);
+    const diffFields = diff(newOptions, this.defaultOptions.current ?? {});
     const updatedOptions = { ...newOptions };
     Object.keys(diffFields).forEach((key) => {
       if (newOptions[key] === '' && this.defaultOptions.current[key] === undefined) {