diff --git a/network/netplay/netplay_discovery.h b/network/netplay/netplay_discovery.h
index 6e7411ccff..077ea9c069 100644
--- a/network/netplay/netplay_discovery.h
+++ b/network/netplay/netplay_discovery.h
@@ -71,16 +71,16 @@ struct netplay_room
    int  gamecrc;
    int  timestamp;
    int  host_method;
-   char retroarch_version [33];
-   char subsystem_name    [256];
    char country           [3];
+   char retroarch_version [33];
    char nickname          [33];
-   char address           [2048];
-   char mitm_address      [2048];
+   char subsystem_name    [256];
    char corename          [256];
    char frontend          [256];
-   char coreversion       [2048];
+   char coreversion       [256];
    char gamename          [256];
+   char address           [2048];
+   char mitm_address      [2048];
    bool has_password;
    bool has_spectate_password;
    bool lan;