diff --git a/esp-link/cgiwifi.c b/esp-link/cgiwifi.c
index 8ae7e3a..9a0ea62 100644
--- a/esp-link/cgiwifi.c
+++ b/esp-link/cgiwifi.c
@@ -640,6 +640,17 @@ int ICACHE_FLASH_ATTR cgiApSettingsChange(HttpdConnData *connData) {
             apconf.ssid_hidden = 0;
         }
     }
+    // Set channel to be hidden or not
+    len=httpdFindArg(connData->getArgs, "ap_channel", buff, sizeof(buff));
+    if(len>0){
+        int value = atoi(buff);
+        if(value >= 1  || value <= 13){
+            apconf.channel = value;
+        }else{
+            // If out of range, set by default
+            apconf.channel = 1;
+        }
+    }
     // Store new configuration
     wifi_softap_set_config(&apconf);
 
@@ -659,6 +670,7 @@ int ICACHE_FLASH_ATTR cgiApSettingsInfo(HttpdConnData *connData) {
                "\"ap_authmode\": %d, "
                "\"ap_maxconn\": %d, "
                "\"ap_beacon\": %d, "
+               "\"ap_channel\": %d, "
                "\"ap_hidden\": \"%s\" "
                " }",
                apconf.ssid,
@@ -666,6 +678,7 @@ int ICACHE_FLASH_ATTR cgiApSettingsInfo(HttpdConnData *connData) {
                apconf.authmode,
                apconf.max_connection,
                apconf.beacon_interval,
+               apconf.channel,
                apconf.ssid_hidden ? "enabled" : "disabled"
                );
 
diff --git a/html/wifi/wifiAp.html b/html/wifi/wifiAp.html
index 41b3697..e61c341 100644
--- a/html/wifi/wifiAp.html
+++ b/html/wifi/wifiAp.html
@@ -69,6 +69,12 @@
                 <div class="popup">Between 100 - 60000 ms ( default 100ms )</div>
               </div>
                
+              <div class="pure-form-stacked">
+                <label>Soft-AP Channel</label>
+                <input type="text" name="ap_channel" />
+                <div class="popup">Between 1 - 13 ( default 1 )</div>
+              </div>
+               
               <div class="form-horizontal">
                <label><input type="checkbox" name="ap_hidden" />Soft-AP SSID hidden</label>
                <div class="popup">Check this box to hide you Soft-AP SSID ( default Not Hidden )</div>
diff --git a/html/wifi/wifiAp.js b/html/wifi/wifiAp.js
index 59dd6ce..50b2c24 100644
--- a/html/wifi/wifiAp.js
+++ b/html/wifi/wifiAp.js
@@ -3,6 +3,7 @@ specials["ap_ssid"] = "SSID name";
 specials["ap_password"] = "PASSWORD";
 specials["ap_maxconn"] = "Max Connections number";
 specials["ap_beacon"] = "Beacon Interval";
+specials["ap_channel"] = "Channel";
 
 function changeWifiMode(m) {
   blockScan = 1;