diff --git a/Arduino/McLighting/McLighting.ino b/Arduino/McLighting/McLighting.ino
index 9700cc2..9e18eff 100644
--- a/Arduino/McLighting/McLighting.ino
+++ b/Arduino/McLighting/McLighting.ino
@@ -333,7 +333,8 @@ void setup() {
   // ***************************************************************************
   // Setup: MDNS responder
   // ***************************************************************************
-  MDNS.begin(HOSTNAME);
+  bool mdns_result = MDNS.begin(HOSTNAME);
+
   DBG_OUTPUT_PORT.print("Open http://");
   DBG_OUTPUT_PORT.print(WiFi.localIP());
   DBG_OUTPUT_PORT.println("/ to open McLighting.");
@@ -566,6 +567,11 @@ void setup() {
 
   server.begin();
 
+  // Start MDNS service
+  if (mdns_result) {
+    MDNS.addService("http", "tcp", 80);
+  }
+
   #ifdef ENABLE_STATE_SAVE
     // Load state string from EEPROM
     String saved_state_string = readEEPROM(256, 32);