diff --git a/data/settings.html b/data/settings.html
index 8dc3654a..e6a5c3b2 100644
--- a/data/settings.html
+++ b/data/settings.html
@@ -43,7 +43,7 @@ <h2>
             </tr>
             <tr>
               <td>
-                <p class="tooltip">MDNS Name<span class="tooltiptext">DNS Name the device will use on the
+                <p class="tooltip">Hostname<span class="tooltiptext">DNS Name the device will use on the
                     network.</span></p>
               </td>
               <td><input type="text" id="deviceName" name="deviceName" value="loading" />
diff --git a/src/HTTP_Server_Basic.cpp b/src/HTTP_Server_Basic.cpp
index 8f74a85e..00dc0db3 100644
--- a/src/HTTP_Server_Basic.cpp
+++ b/src/HTTP_Server_Basic.cpp
@@ -55,7 +55,11 @@ void startWifi()
   {
     WiFi.mode(WIFI_STA);
     WiFi.setTxPower(WIFI_POWER_19_5dBm);
+    // Setting the hostname for DNS requires this line before calling "Wifi.begin(...)"
+    // See: https://github.com/espressif/arduino-esp32/issues/2537#issuecomment-590029109
+    WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE);
     WiFi.begin(userConfig.getSsid(), userConfig.getPassword());
+    WiFi.setHostname(userConfig.getDeviceName());
   }
 
   while (WiFi.status() != WL_CONNECTED)