diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
index 7ad02ec3..6f62650e 100644
--- a/code/espurna/config/general.h
+++ b/code/espurna/config/general.h
@@ -93,6 +93,7 @@
 #define WEBSERVER_PORT          80
 #define DNS_PORT                53
 #define ENABLE_CAPTIVE_PORTAL   0
+#define ENABLE_MDNS             1
 
 #define WEB_MODE_NORMAL         0
 #define WEB_MODE_PASSWORD       1
diff --git a/code/espurna/wifi.ino b/code/espurna/wifi.ino
index 4ffe2179..14a20de3 100644
--- a/code/espurna/wifi.ino
+++ b/code/espurna/wifi.ino
@@ -182,14 +182,16 @@ void wifiSetup() {
 		#endif
 
         // Configure mDNS
-	    if (code == MESSAGE_CONNECTED) {
-            if (MDNS.begin((char *) WiFi.hostname().c_str())) {
-                MDNS.addService("http", "tcp", 80);
-	            DEBUG_MSG_P(PSTR("[MDNS] OK\n"));
-	        } else {
-	            DEBUG_MSG_P(PSTR("[MDNS] FAIL\n"));
-	        }
-	    }
+        #if ENABLE_MDNS
+    	    if (code == MESSAGE_CONNECTED) {
+                if (MDNS.begin((char *) WiFi.hostname().c_str())) {
+                    MDNS.addService("http", "tcp", 80);
+    	            DEBUG_MSG_P(PSTR("[MDNS] OK\n"));
+    	        } else {
+    	            DEBUG_MSG_P(PSTR("[MDNS] FAIL\n"));
+    	        }
+    	    }
+        #endif
 
         // Configure captive portal
         #if ENABLE_CAPTIVE_PORTAL