diff --git a/lib/framework/ESP8266React.h b/lib/framework/ESP8266React.h
index 42e3f7a8..5841078b 100644
--- a/lib/framework/ESP8266React.h
+++ b/lib/framework/ESP8266React.h
@@ -6,9 +6,11 @@
 #ifdef ESP32
 #include <AsyncTCP.h>
 #include <WiFi.h>
+#include <ESPmDNS.h>
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESPAsyncTCP.h>
+#include <ESP8266mDNS.h>
 #endif
 
 #include <FeaturesService.h>
diff --git a/lib/framework/WiFiSettingsService.cpp b/lib/framework/WiFiSettingsService.cpp
index 1a6b7ad4..f4c5bd31 100644
--- a/lib/framework/WiFiSettingsService.cpp
+++ b/lib/framework/WiFiSettingsService.cpp
@@ -80,6 +80,7 @@ void WiFiSettingsService::manageSTA() {
     }
     // attempt to connect to the network
     WiFi.begin(_state.ssid.c_str(), _state.password.c_str());
+    MDNS.begin(_state.hostname.c_str());
   }
 }
 
diff --git a/lib/framework/WiFiSettingsService.h b/lib/framework/WiFiSettingsService.h
index 1f5036b5..f380f607 100644
--- a/lib/framework/WiFiSettingsService.h
+++ b/lib/framework/WiFiSettingsService.h
@@ -7,6 +7,14 @@
 #include <HttpEndpoint.h>
 #include <JsonUtils.h>
 
+#ifdef ESP32
+#include <WiFi.h>
+#include <ESPmDNS.h>
+#elif defined(ESP8266)
+#include <ESP8266WiFi.h>
+#include <ESP8266mDNS.h>
+#endif
+
 #ifndef FACTORY_WIFI_SSID
 #define FACTORY_WIFI_SSID ""
 #endif