diff --git a/include/NetTransport.h b/include/NetTransport.h
index f24648e..968ed12 100644
--- a/include/NetTransport.h
+++ b/include/NetTransport.h
@@ -56,6 +56,7 @@ void StartTimeGet(void);
 
 void WiFiAPStart(void);
 void WiFiSTAStart(void);
+void WiFiStop(void);
 void WiFiScan(void);
 void EthStart(void);
 
diff --git a/src/HTTPPostSystem.c b/src/HTTPPostSystem.c
index 20b9eda..4543d52 100644
--- a/src/HTTPPostSystem.c
+++ b/src/HTTPPostSystem.c
@@ -482,14 +482,12 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData)
     {
         if (!strcmp(tmp, (const char*) "1"))
         {
-            WiFiScan();
+            WiFiAPStart();
             return HTTP_IO_DONE_NOREFRESH;
         }
         else if (!strcmp(tmp, (const char*) "2"))
         {
-#if CONFIG_WEBGUIAPP_GPRS_ENABLE
-            PPPModemGetRSSI();
-#endif
+            WiFiStop();
             return HTTP_IO_DONE_NOREFRESH;
         }
         else if (!strcmp(tmp, (const char*) "3"))
diff --git a/src/WiFiTransport.c b/src/WiFiTransport.c
index a76c155..2f76919 100644
--- a/src/WiFiTransport.c
+++ b/src/WiFiTransport.c
@@ -497,6 +497,12 @@ void WiFiSTAStart(void)
     xTaskCreate(wifi_init_sta, "InitStationTask", 1024 * 4, (void*) 0, 3, NULL);
 }
 
+void WiFiStop(void)
+{
+    esp_wifi_scan_stop();
+    esp_wifi_deinit();
+}
+
 static void wifi_scan(void *arg)
 {
     uint16_t number = DEFAULT_SCAN_LIST_SIZE;