diff --git a/src/ui/components/ChannelsConfigurator.tsx b/src/ui/components/ChannelsConfigurator.tsx
index d81bb45f..92f47de8 100644
--- a/src/ui/components/ChannelsConfigurator.tsx
+++ b/src/ui/components/ChannelsConfigurator.tsx
@@ -115,6 +115,7 @@ const Configurator: React.FC<{ uiState: UIState, uiStateEvents: EventEmitter }>
             setTimeout(() => {
                 uiStateEvents.emit("notify:restart-required");
             }, 500);
+            setSaved(false);
             return;
         }
         (async () => {
@@ -127,9 +128,6 @@ const Configurator: React.FC<{ uiState: UIState, uiStateEvents: EventEmitter }>
                 console.error(e);
             }
         })();
-        return () => {
-            setSaved(false);
-        }
     }, [saved]);
 
     const items = [];
diff --git a/src/ui/components/Restart.tsx b/src/ui/components/Restart.tsx
index 3b5470ca..f75c8218 100644
--- a/src/ui/components/Restart.tsx
+++ b/src/ui/components/Restart.tsx
@@ -42,7 +42,7 @@ const Restart: React.FC<{ uiStateEvents: EventEmitter }> = ({ uiStateEvents }) =
         return () => {
             uiStateEvents.off("notify:restart-required", onRestartRequired);
         };
-    });
+    }, []);
 
     return (
         <>
diff --git a/src/ui/components/ServerConfigurator.tsx b/src/ui/components/ServerConfigurator.tsx
index 729b6438..51e2570f 100644
--- a/src/ui/components/ServerConfigurator.tsx
+++ b/src/ui/components/ServerConfigurator.tsx
@@ -50,21 +50,19 @@ const Configurator: React.FC<{ uiState: UIState, uiStateEvents: EventEmitter }>
             setTimeout(() => {
                 uiStateEvents.emit("notify:restart-required");
             }, 500);
+            setSaved(false);
             return;
         }
         (async () => {
             try {
                 const res = await (await fetch(configAPI)).json();
                 console.log("ServerConfigurator", "GET", configAPI, "->", res);
-                setEditing({...res});
-                setCurrent({...res});
+                setEditing({ ...res });
+                setCurrent({ ...res });
             } catch (e) {
                 console.error(e);
             }
         })();
-        return () => {
-            setSaved(false);
-        }
     }, [saved]);
 
     const docker = uiState.status.process.env.DOCKER === "YES";
diff --git a/src/ui/components/StatusView.tsx b/src/ui/components/StatusView.tsx
index aed13f61..5ff64279 100644
--- a/src/ui/components/StatusView.tsx
+++ b/src/ui/components/StatusView.tsx
@@ -49,7 +49,7 @@ const StatusView: React.FC<{ uiState: UIState, uiStateEvents: EventEmitter }> =
             uiStateEvents.off("update:status", onStatusUpdate);
             uiStateEvents.off("update:tuners", onTunersUpdate);
         };
-    });
+    }, []);
 
     const statusItem: StatusItem[] = [];
 
diff --git a/src/ui/components/TunersConfigurator.tsx b/src/ui/components/TunersConfigurator.tsx
index 21aa5a49..3dc15865 100644
--- a/src/ui/components/TunersConfigurator.tsx
+++ b/src/ui/components/TunersConfigurator.tsx
@@ -108,6 +108,7 @@ const Configurator: React.FC<{ uiState: UIState, uiStateEvents: EventEmitter }>
             setTimeout(() => {
                 uiStateEvents.emit("notify:restart-required");
             }, 500);
+            setSaved(false);
             return;
         }
         (async () => {
@@ -120,9 +121,6 @@ const Configurator: React.FC<{ uiState: UIState, uiStateEvents: EventEmitter }>
                 console.error(e);
             }
         })();
-        return () => {
-            setSaved(false);
-        }
     }, [saved]);
 
     const items = [];