diff --git a/frontend/src/Editor/EditorFunc.jsx b/frontend/src/Editor/EditorFunc.jsx
index 89931834f3..bc9909cffc 100644
--- a/frontend/src/Editor/EditorFunc.jsx
+++ b/frontend/src/Editor/EditorFunc.jsx
@@ -256,7 +256,7 @@ const EditorComponent = (props) => {
       canvasContainerRef.current.scrollLeft += editorMarginLeft;
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editorMarginLeft]);
+  }, [editorMarginLeft, canvasContainerRef?.current]);
 
   useEffect(() => {
     if (mounted) {
diff --git a/frontend/src/Editor/Inspector/ActionConfigurationPanels/GotoApp.jsx b/frontend/src/Editor/Inspector/ActionConfigurationPanels/GotoApp.jsx
index d42ebee133..3c8636d647 100644
--- a/frontend/src/Editor/Inspector/ActionConfigurationPanels/GotoApp.jsx
+++ b/frontend/src/Editor/Inspector/ActionConfigurationPanels/GotoApp.jsx
@@ -6,8 +6,10 @@ import { useTranslation } from 'react-i18next';
 
 export function GotoApp({ getAllApps, event, handlerChanged, eventIndex, darkMode }) {
   const queryParamChangeHandler = (index, key, value) => {
-    event.queryParams[index][key] = value;
-    handlerChanged(eventIndex, 'queryParams', event.queryParams);
+    if (event?.queryParams?.[index]?.[key]) {
+      event.queryParams[index][key] = value;
+      handlerChanged(eventIndex, 'queryParams', event.queryParams);
+    }
   };
   const { t } = useTranslation();
 
diff --git a/frontend/src/Editor/Inspector/ActionConfigurationPanels/SwitchPage.jsx b/frontend/src/Editor/Inspector/ActionConfigurationPanels/SwitchPage.jsx
index cd3dffe52e..dc697c4797 100644
--- a/frontend/src/Editor/Inspector/ActionConfigurationPanels/SwitchPage.jsx
+++ b/frontend/src/Editor/Inspector/ActionConfigurationPanels/SwitchPage.jsx
@@ -69,7 +69,7 @@ export function SwitchPage({ getPages, event, handlerChanged, eventIndex, darkMo
           <div key={index} className="row input-group mt-1">
             <div className="col">
               <CodeHinter
-                initialValue={event.queryParams[index][0]}
+                initialValue={event?.queryParams?.[index]?.[0]}
                 onChange={(value) => queryParamChangeHandler(index, 0, value)}
                 mode="javascript"
                 className="form-control codehinter-query-editor-input"
@@ -79,7 +79,7 @@ export function SwitchPage({ getPages, event, handlerChanged, eventIndex, darkMo
             </div>
             <div className="col">
               <CodeHinter
-                initialValue={event.queryParams[index][1]}
+                initialValue={event?.queryParams?.[index]?.[1]}
                 onChange={(value) => queryParamChangeHandler(index, 1, value)}
                 mode="javascript"
                 className="form-control codehinter-query-editor-input"