diff --git a/src/main.cpp b/src/main.cpp
index 7feb8331..c7c4f5b8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -47,6 +47,14 @@ void setup()
     gpioSetup();
 #endif
 
+#if HASP_USE_ETHERNET > 0
+    ethernetSetup();
+#endif
+
+#if HASP_USE_MQTT > 0
+    mqttSetup(); // Load Hostname before starting WiFi
+#endif
+
 #if HASP_USE_WIFI > 0
     wifiSetup();
 #endif
@@ -64,14 +72,6 @@ void setup()
     otaSetup();
 #endif
 
-#if HASP_USE_ETHERNET > 0
-    ethernetSetup();
-#endif
-
-#if HASP_USE_MQTT > 0
-    mqttSetup();
-#endif
-
 #if HASP_USE_HTTP > 0
     httpSetup();
 #endif