diff --git a/src/Settings.h b/src/Settings.h
index 383c2a5..40adbf3 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -17,7 +17,7 @@ struct Settings {
 
   struct {
     char server[80];
-    unsigned int port = 1883;
+    unsigned short port = 1883;
     char user[32];
     char password[32];
     char prefix[80] = "opentherm";
diff --git a/src/WifiManagerTask.h b/src/WifiManagerTask.h
index 3a4330a..d553795 100644
--- a/src/WifiManagerTask.h
+++ b/src/WifiManagerTask.h
@@ -9,7 +9,7 @@
 WiFiManager wm;
 WiFiManagerParameter* wmHostname;
 WiFiManagerParameter* wmMqttServer;
-UnsignedIntParameter* wmMqttPort;
+UnsignedShortParameter* wmMqttPort;
 WiFiManagerParameter* wmMqttUser;
 WiFiManagerParameter* wmMqttPassword;
 WiFiManagerParameter* wmMqttPrefix;
@@ -66,7 +66,7 @@ public:
     wmMqttServer = new WiFiManagerParameter("mqtt_server", "Server", settings.mqtt.server, 80);
     wm.addParameter(wmMqttServer);
 
-    wmMqttPort = new UnsignedIntParameter("mqtt_port", "Port", settings.mqtt.port, 6);
+    wmMqttPort = new UnsignedShortParameter("mqtt_port", "Port", settings.mqtt.port, 6);
     wm.addParameter(wmMqttPort);
 
     wmMqttUser = new WiFiManagerParameter("mqtt_user", "Username", settings.mqtt.user, 32);
@@ -303,7 +303,7 @@ protected:
       changed = true;
       settings.mqtt.port = wmMqttPort->getValue();
 
-      Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New mqtt.port: %du"), settings.mqtt.port);
+      Log.sinfoln(FPSTR(S_WIFI_SETTINGS), F("New mqtt.port: %hu"), settings.mqtt.port);
     }
 
     if (strcmp(wmMqttUser->getValue(), settings.mqtt.user) != 0) {