diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index 834544b6b3..d50fabba35 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -2272,6 +2272,15 @@ void NetPlayServer::AssignNewUserAPad(const Client& player)
       break;
     }
   }
+  for (PlayerId& mapping : m_wiimote_map)
+  {
+    // 0 means unmapped
+    if (mapping == 0)
+    {
+      mapping = player.pid;
+      break;
+    }
+  }
 }
 
 PlayerId NetPlayServer::GiveFirstAvailableIDTo(ENetPeer* player)