diff --git a/include/wlan.h b/include/wlan.h
index 063b422..6fe841a 100644
--- a/include/wlan.h
+++ b/include/wlan.h
@@ -5,7 +5,8 @@
 #include <ESP8266WiFi.h>
 #include <PubSubClient.h>
 
-void initial_connection(const char *ssid, const char *psk);
+void initial_connection(const char *ssid, const char *psk,
+                        const char *hostname);
 void connect_wlan(Config *config);
 void connect_mqtt(PubSubClient &client, Config *config);
 void disconnect_mqtt(PubSubClient &client, const char *topic);
diff --git a/src/wlan.cpp b/src/wlan.cpp
index 8778f0b..19f101b 100644
--- a/src/wlan.cpp
+++ b/src/wlan.cpp
@@ -1,7 +1,9 @@
 #include "wlan.h"
 #include <ArduinoJson.h>
 
-void initial_connection(const char *ssid, const char *psk) {
+void initial_connection(const char *ssid, const char *psk,
+                        const char *hostname) {
+  WiFi.hostname(hostname);
   WiFi.begin(ssid, psk);
   WiFi.persistent(true);
   WiFi.setAutoConnect(true);
@@ -10,7 +12,7 @@ void initial_connection(const char *ssid, const char *psk) {
 
 void connect_wlan(Config *config) {
   if (WiFi.SSID() != config->ssid)
-    initial_connection(config->ssid, config->psk);
+    initial_connection(config->ssid, config->psk, config->device_id);
   int retries = 0;
   while (WiFi.status() != WL_CONNECTED) {
     if (retries == config->connection_attempts)