diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
index 40015024d..2e6d694f7 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
@@ -47,6 +47,7 @@ export default function ParameterComponent({
   const { closePopUp } = useContext(PopUpContext);
   const { setTabsState, tabId, save } = useContext(TabsContext);
 
+
   useEffect(() => {
     if (ref.current && ref.current.offsetTop && ref.current.clientHeight) {
       setPosition(ref.current.offsetTop + ref.current.clientHeight / 2);
@@ -58,11 +59,11 @@ export default function ParameterComponent({
     updateNodeInternals(data.id);
   }, [data.id, position, updateNodeInternals]);
 
-  const [enabled, setEnabled] = useState(
-    data.node.template[name]?.value ?? false
-  );
 
-  useEffect(() => {}, [closePopUp, data.node.template]);
+  useEffect(() => {
+    
+  }, [closePopUp, data.node.template]);
+
 
   const { reactFlowInstance } = useContext(typesContext);
   let disabled =
@@ -239,12 +240,10 @@ export default function ParameterComponent({
           <div className="mt-2 w-full">
             <ToggleShadComponent
               disabled={disabled}
-              enabled={enabled}
+              enabled={data.node.template[name].value}
               setEnabled={(t) => {
                 handleOnNewValue(t);
-                setEnabled(t);
               }}
-              
               size="large"
             />
           </div>
diff --git a/src/frontend/src/modals/EditNodeModal/index.tsx b/src/frontend/src/modals/EditNodeModal/index.tsx
index 7bf8f54df..47e0db079 100644
--- a/src/frontend/src/modals/EditNodeModal/index.tsx
+++ b/src/frontend/src/modals/EditNodeModal/index.tsx
@@ -55,7 +55,6 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) {
   const { closePopUp } = useContext(PopUpContext);
   const { types } = useContext(typesContext);
   const ref = useRef();
-  const [enabled, setEnabled] = useState(null);
   const { setTabsState, tabId, save } = useContext(TabsContext);
   const { reactFlowInstance } = useContext(typesContext);
 
@@ -202,10 +201,9 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) {
                                 {" "}
                                 <ToggleShadComponent
                                   disabled={disabled}
-                                  enabled={enabled}
+                                  enabled={data.node.template[n].value}
                                   setEnabled={(t) => {
                                     handleOnNewValue(t, n);
-                                    setEnabled(t);
                                   }}
                                   size="small"
                                 />