diff --git a/src/main.cpp b/src/main.cpp
index 0b91b05..bc2250c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,10 +28,10 @@ struct AuthConfig {
   char pass[32] = "";
 };
 
-static char hostname[32] = HOSTNAME_DEFAULT;
+static char hostname[64] = HOSTNAME_DEFAULT;
 static MqttConfig mqttCfg;
 static AuthConfig authCfg;
-static WiFiManagerParameter hostnameParam("hostname", "Device hostname", hostname, 32);
+static WiFiManagerParameter hostnameParam("hostname", "Device hostname", hostname, 63);
 static WebServer server(80);
 static WiFiClient wifiClient;
 static PubSubClient mqttClient(wifiClient);
@@ -304,7 +304,7 @@ static void handleRoot() {
   html += "<div><span>Hostname</span><span>" + String(hostname) + "</span></div>";
   html += "<div><span>IP</span><span>" + WiFi.localIP().toString() + "</span></div></div>";
   html += "<form action=/config method=post>";
-  html += "<label>Hostname</label><input name=hostname value='" + String(hostname) + "'>";
+  html += "<label>Hostname</label><input name=hostname maxlength=63 value='" + String(hostname) + "'>";
   html += authSection;
   html += mqttSection;
   html += "<button class=btn type=submit>Save</button></form>";