diff --git a/src/wifi.h b/src/wifi.h
index 812a6f3..47713f1 100644
--- a/src/wifi.h
+++ b/src/wifi.h
@@ -16,10 +16,9 @@ namespace Wifi {
       tWifiConnected.restart();
       });
 
-    WiFi.hostname("esp-clock");
 
     ESP8266WiFiMulti wifiMulti;
-    for (int i = 0; i < sizeof(credentials)/sizeof(WifiCredentials); i++) {
+    for (uint32_t i = 0; i < sizeof(credentials) / sizeof(WifiCredentials); i++) {
       wifiMulti.addAP(credentials[i].ssid, credentials[i].password);
     }
 
@@ -27,6 +26,7 @@ namespace Wifi {
     while (wifiMulti.run() != WL_CONNECTED) {
       delay(500);
     }
+    WiFi.setHostname("esp-clock");
     currentSSID = WiFi.SSID();
     currentPsk = WiFi.psk();
   }