diff --git a/src/containers/Settings/index.tsx b/src/containers/Settings/index.tsx
index 8165eee..8909390 100644
--- a/src/containers/Settings/index.tsx
+++ b/src/containers/Settings/index.tsx
@@ -56,7 +56,7 @@ class Settings extends React.Component<I18nProps, {}> {
     }
 
     handleSocksPortSave = async () => {
-        const [, err] = await to(updateConfig({ 'socket-port': this.state.socks5ProxyPort }))
+        const [, err] = await to(updateConfig({ 'socks-port': this.state.socks5ProxyPort }))
         if (err === null) {}
     }
 
@@ -87,18 +87,19 @@ class Settings extends React.Component<I18nProps, {}> {
                 setAsSystemProxy,
                 isClashX: true
             })
-        } else {
-            await rootStores.store.fetchConfig()
         }
-        const general = rootStores.store.config.general
+        await rootStores.store.fetchData()
+
+        const config = rootStores.store.config.general
+        const general = rootStores.store.data.general
         this.setState({
             allowConnectFromLan: general.allowLan,
             proxyMode: general.mode,
             socks5ProxyPort: general.socksPort,
             httpProxyPort: general.port,
-            externalControllerHost: general.externalControllerAddr,
-            externalControllerPort: general.externalControllerPort,
-            externalControllerSecret: general.secret
+            externalControllerHost: config.externalControllerAddr,
+            externalControllerPort: config.externalControllerPort,
+            externalControllerSecret: config.secret
         })
     }
 
diff --git a/src/lib/request.ts b/src/lib/request.ts
index 98f5cdd..6ee9a55 100644
--- a/src/lib/request.ts
+++ b/src/lib/request.ts
@@ -9,7 +9,7 @@ let logsStreamReader = null
 
 export interface Config {
     port: number
-    'socket-port': number
+    'socks-port': number
     'redir-port': number
     'allow-lan': boolean
     mode: string
diff --git a/src/stores/ConfigStore.ts b/src/stores/ConfigStore.ts
index a824a7d..96bdd92 100644
--- a/src/stores/ConfigStore.ts
+++ b/src/stores/ConfigStore.ts
@@ -29,10 +29,11 @@ export class ConfigStore {
         runInAction(() => {
             this.data.general = {
                 port: general.port,
-                socksPort: general['socket-port'],
+                socksPort: general['socks-port'],
                 redirPort: general['redir-port'],
                 mode: general.mode,
-                logLevel: general['log-level']
+                logLevel: general['log-level'],
+                allowLan: general['allow-lan']
             }
 
             const policyGroup = new Set(['Selector', 'URLTest', 'Fallback'])
@@ -102,7 +103,7 @@ export class ConfigStore {
         this.config = {
             general: {
                 port: config.port,
-                socksPort: config['socket-port'],
+                socksPort: config['socks-port'],
                 redirPort: config['redir-port'],
                 allowLan: config['allow-lan'],
                 mode: config.mode,