diff --git a/esp8266/esp8266.ino b/esp8266/esp8266.ino
index 83470e7f..83fb1597 100644
--- a/esp8266/esp8266.ino
+++ b/esp8266/esp8266.ino
@@ -98,10 +98,7 @@ void setup() {
 
 #ifdef MDNS_FEATURE
 	// Check for any mDNS queries and send responses
-	if (wifi_get_opmode()==WIFI_STA )
-		{
-			wifi_config.mdns.addService("http", "tcp", wifi_config.iweb_port);
-		}
+	wifi_config.mdns.addService("http", "tcp", wifi_config.iweb_port);
 #endif
 
 #ifdef SSDP_FEATURE
diff --git a/esp8266/webinterface.cpp b/esp8266/webinterface.cpp
index 5ebcc4c4..e40ae6ee 100644
--- a/esp8266/webinterface.cpp
+++ b/esp8266/webinterface.cpp
@@ -524,12 +524,9 @@ void handle_web_interface_root()
   LABEL_UNITS(FPSTR(FREE_MEM_TITLE),String(system_get_free_heap_size()).c_str(),FPSTR(UNIT_OCTET))
   LABEL(FPSTR(SDK_VERSION_TITLE),system_get_sdk_version())
   #ifdef MDNS_FEATURE
-  if (wifi_get_opmode()==WIFI_STA )
-	{
-	sstatus = FPSTR(HTTP_START);
-	sstatus+=FPSTR(LOCAL_NAME);
-	LABEL_UNITS(FPSTR(HTTP_MDNS_NAME),sstatus.c_str(),FPSTR(HTTP_END))
-	}
+  sstatus = FPSTR(HTTP_START);
+  sstatus+=FPSTR(LOCAL_NAME);
+  LABEL_UNITS(FPSTR(HTTP_MDNS_NAME),sstatus.c_str(),FPSTR(HTTP_END))
   #endif
   #ifdef SSDP_FEATURE
   LABEL(FPSTR(SSDP_PROTOCOL_NAME),FPSTR(VALUE_YES))
@@ -544,7 +541,6 @@ void handle_web_interface_root()
   else if (istatus==LIGHT_SLEEP_T) sstatus=FPSTR(VALUE_LIGHT);
   else  sstatus=FPSTR(VALUE_MODEM);
   LABEL(FPSTR(SLEEP_MODE_TITLE),sstatus.c_str())
-  //LABEL(sbuf,"Boot mode: ",String(system_get_boot_mode())) //no meaning so far
   LABEL(FPSTR(BOOT_VERSION_TITLE),String(system_get_boot_version()).c_str())
   istatus=0;
   if (!CONFIG::read_buffer(EP_BAUD_RATE,  (byte *)&lstatus , INTEGER_LENGH))lstatus=0;
diff --git a/esp8266/wifi.cpp b/esp8266/wifi.cpp
index 155908b8..98ba0f55 100644
--- a/esp8266/wifi.cpp
+++ b/esp8266/wifi.cpp
@@ -159,11 +159,10 @@ bool WIFI_CONFIG::Setup()
     }
     #ifdef MDNS_FEATURE
     // Set up mDNS responder:
-    if (wifi_get_opmode()==WIFI_STA )
-		if (!mdns.begin(String(FPSTR(LOCAL_NAME)).c_str())) {
-		Serial.println(F("M117 Error with mDNS!"));
-		delay(1000);
-		}
+	if (!mdns.begin(String(FPSTR(LOCAL_NAME)).c_str())) {
+	Serial.println(F("M117 Error with mDNS!"));
+	delay(1000);
+	}
     #endif
     //Get IP
     if (wifi_get_opmode()==WIFI_STA)currentIP=WiFi.localIP();