diff --git a/front/plugins/ui_settings/config.json b/front/plugins/ui_settings/config.json
index 8bb9c07f..d8efd580 100755
--- a/front/plugins/ui_settings/config.json
+++ b/front/plugins/ui_settings/config.json
@@ -704,6 +704,34 @@
           "string": "Based on which value should the network topology view be ordered."
         }
       ]
+    },
+    {
+      "function": "WAIT_FOR_SETTINGS",
+      "type": {
+        "dataType": "boolean",
+        "elements": [
+          {
+            "elementType": "input",
+            "elementOptions": [{ "type": "checkbox" }],
+            "transformers": []
+          }
+        ]
+      },
+      "default_value": false,
+      "options": [],
+      "localized": ["name", "description"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Wait for settings reload"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "When enabled, the UI blocks after saving settings until the backend finishes reloading. When disabled (default), the UI returns immediately for most changes and only waits when plugin configuration changes."
+        }
+      ]
     }
   ]
 }
diff --git a/server/conf.py b/server/conf.py
index c28dfc9c..4eda3e84 100755
--- a/server/conf.py
+++ b/server/conf.py
@@ -32,7 +32,6 @@ SCAN_SUBNETS = ["192.168.1.0/24 --interface=eth1", "192.168.1.0/24 --interface=e
 LOG_LEVEL = "verbose"
 TIMEZONE = "Europe/Berlin"
 UI_LANG = "English (en_us)"
-UI_WAIT_FOR_SETTINGS = False
 UI_PRESENCE = ["online", "offline", "archived"]
 UI_MY_DEVICES = ["online", "offline", "archived", "new", "down"]
 UI_NOT_RANDOM_MAC = []
diff --git a/server/initialise.py b/server/initialise.py
index 0cc06a21..bf53c494 100755
--- a/server/initialise.py
+++ b/server/initialise.py
@@ -452,16 +452,6 @@ def importConfigs(pm, db, all_plugins):
         "UI",
     )
 
-    conf.UI_WAIT_FOR_SETTINGS = ccd(
-        "UI_WAIT_FOR_SETTINGS",
-        False,
-        c_d,
-        "Wait for settings reload",
-        '{"dataType":"boolean", "elements": [{"elementType" : "checkbox", "elementOptions" : [] ,"transformers": []}]}',
-        "[]",
-        "UI",
-    )
-
     #  Init timezone in case it changed and handle invalid values
     try:
         if conf.TIMEZONE not in all_timezones: