diff --git a/common/sysconfig.cpp b/common/sysconfig.cpp
index 102a3cf..ec56614 100644
--- a/common/sysconfig.cpp
+++ b/common/sysconfig.cpp
@@ -102,14 +102,14 @@ static inline int digit(char a) {
     return a - '0';
 }
 
-unsigned short get_console_peertopeer_port() {
+uint16_t get_console_peertopeer_port() {
     const char * serial = get_console_serial();
 
-    unsigned short port = 50000 +
-                          (digit(serial[4]) * 1000) +
-                          (digit(serial[5]) * 100 ) +
-                          (digit(serial[6]) * 10  ) +
-                          (digit(serial[7]) * 1   );
+    uint16_t port = 50000 +
+                    (digit(serial[4]) * 1000) +
+                    (digit(serial[5]) * 100 ) +
+                    (digit(serial[6]) * 10  ) +
+                    (digit(serial[7]) * 1   );
 
     return port;
 }
diff --git a/plugin/src/config.cpp b/plugin/src/config.cpp
index 5ce07a8..1ca4be4 100644
--- a/plugin/src/config.cpp
+++ b/plugin/src/config.cpp
@@ -139,7 +139,8 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa
     if (!res) return report_error(err);
 
     {
-        std::string multiplayer_port_text = std::vformat(strings.multiplayer_port_display, std::make_format_args(get_console_peertopeer_port()));
+        uint16_t port = get_console_peertopeer_port();
+        std::string multiplayer_port_text = std::vformat(strings.multiplayer_port_display, std::make_format_args(port));
         res = network_cat->add(WUPSConfigItemStub::Create(multiplayer_port_text), err);
         if (!res) return report_error(err);
     }