diff --git a/app/assets/javascripts/components/AccountMenu/AdvancedOptions.tsx b/app/assets/javascripts/components/AccountMenu/AdvancedOptions.tsx
index 93638dc38..eb16d545c 100644
--- a/app/assets/javascripts/components/AccountMenu/AdvancedOptions.tsx
+++ b/app/assets/javascripts/components/AccountMenu/AdvancedOptions.tsx
@@ -20,16 +20,6 @@ export const AdvancedOptions: FunctionComponent<Props> = observer(
       appState.accountMenu;
     const [showAdvanced, setShowAdvanced] = useState(false);
 
-    useEffect(() => {
-      if (isDev && window._devAccountServer) {
-        setEnableServerOption(true);
-        setServer(window._devAccountServer);
-        application.setCustomHost(window._devAccountServer);
-      }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
-
-
     const handleServerOptionChange = (e: Event) => {
       if (e.target instanceof HTMLInputElement) {
         setEnableServerOption(e.target.checked);
diff --git a/app/assets/javascripts/ui_models/app_state/account_menu_state.ts b/app/assets/javascripts/ui_models/app_state/account_menu_state.ts
index 7b8ede15b..fe8677eca 100644
--- a/app/assets/javascripts/ui_models/app_state/account_menu_state.ts
+++ b/app/assets/javascripts/ui_models/app_state/account_menu_state.ts
@@ -1,3 +1,4 @@
+import { isDev } from '@/utils';
 import {
   action,
   computed,
@@ -74,7 +75,11 @@ export class AccountMenuState {
     this.appEventListeners.push(
       this.application.addEventObserver(async () => {
         runInAction(() => {
-          this.setServer(this.application.getHost());
+          if (isDev && window._devAccountServer) {
+            this.setServer(window._devAccountServer);
+          } else {
+            this.setServer(this.application.getHost());
+          }
         });
       }, ApplicationEvent.Launched)
     );