diff --git a/data/networks.js b/data/networks.js
index 11295bb..9bc4b17 100644
--- a/data/networks.js
+++ b/data/networks.js
@@ -7,8 +7,8 @@ const refreshIcon = refreshButton.querySelector("img");
 let isLoading = false;
 
 refreshButton.addEventListener("click", async () => {
-    // check if interface is connected via WiFi
-    if (data.connection == 0 || data.connection == 1) {
+    // check if interface is in WiFi-AccessPoint mode
+    if (data.connection == 1) {
         alert(
             "Beim WLAN-Scan wird die Verbindung hardwarebedingt kurzzeitig" +
                 "unterbrochen.\n" +
diff --git a/data/submit.js b/data/submit.js
index f7e5924..5607381 100644
--- a/data/submit.js
+++ b/data/submit.js
@@ -55,18 +55,20 @@ export async function updateConfig(fetchOptions) {
         if (!res.ok) {
             throw new Error(`Response status: ${res.status}`);
         }
-
-        // wait for the esp to restart
-        const delay = new Promise((resolve) =>
-            setTimeout(() => resolve(), 500)
-        );
-        await delay;
-
-        const data = await loadData(30 * 1000);
-        writeDataToInput(data);
-        hideLoadingScreen();
     } catch (error) {
         console.error(error.message);
         showError(error.message);
     }
+
+    for (let i = 0; i < 10; i++) {
+        try {
+            const data = await loadData(5000);
+            writeDataToInput(data);
+            hideLoadingScreen();
+
+            break;
+        } catch (error) {
+            // retry loading config until successful
+        }
+    }
 }