diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index 640b3ee..0f93180 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -107,6 +107,7 @@ void setup() {
     networkManager = new NetworkManager();
     networkManager->setup();
     networkManager->setAPTimeout(Config.wifiAutoAP.timeout * 60 * 1000); // Convert minutes to milliseconds
+    networkManager->setHostName("iGATE-" + Config.callsign);
     POWER_Utils::setup();
     Utils::setupDisplay();
     LoRa_Utils::setup();
diff --git a/src/wifi_utils.cpp b/src/wifi_utils.cpp
index f322df9..93ec289 100644
--- a/src/wifi_utils.cpp
+++ b/src/wifi_utils.cpp
@@ -85,9 +85,6 @@ namespace WIFI_Utils {
             return;
         }
 
-        String hostName = "iGATE-" + Config.callsign;
-        WiFi.setHostname(hostName.c_str());
-
         // TODO: Create generic multi-SSID support in Network Manager
         while (!networkManager->isWiFiConnected()) {
             displayShow("", "Connecting to WiFi:", "", currentWiFi->ssid + " ...", 0);