diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index afbfdc9..bce2f03 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -2124,15 +2124,21 @@ export default class RoomClient
 							lobbyPeers.forEach((peer) =>
 							{
 								store.dispatch(
-									lobbyPeerActions.addLobbyPeer(peer.peerId));
+									lobbyPeerActions.addLobbyPeer(peer.id));
+
 								store.dispatch(
 									lobbyPeerActions.setLobbyPeerDisplayName(
 										peer.displayName,
-										peer.peerId
+										peer.id
 									)
 								);
+
 								store.dispatch(
-									lobbyPeerActions.setLobbyPeerPicture(peer.picture));
+									lobbyPeerActions.setLobbyPeerPicture(
+										peer.picture,
+										peer.id
+									)
+								);
 							});
 	
 							store.dispatch(
@@ -2930,11 +2936,11 @@ export default class RoomClient
 			(lobbyPeers.length > 0) && lobbyPeers.forEach((peer) =>
 			{
 				store.dispatch(
-					lobbyPeerActions.addLobbyPeer(peer.peerId));
+					lobbyPeerActions.addLobbyPeer(peer.id));
 				store.dispatch(
-					lobbyPeerActions.setLobbyPeerDisplayName(peer.displayName, peer.peerId));
+					lobbyPeerActions.setLobbyPeerDisplayName(peer.displayName, peer.id));
 				store.dispatch(
-					lobbyPeerActions.setLobbyPeerPicture(peer.picture));
+					lobbyPeerActions.setLobbyPeerPicture(peer.picture, peer.id));
 			});
 
 			(accessCode != null) && store.dispatch(
diff --git a/server/lib/Lobby.js b/server/lib/Lobby.js
index 0bcfb66..43fc30d 100644
--- a/server/lib/Lobby.js
+++ b/server/lib/Lobby.js
@@ -46,7 +46,7 @@ class Lobby extends EventEmitter
 
 		return Object.values(this._peers).map((peer) =>
 			({
-				peerId      : peer.id,
+				id          : peer.id,
 				displayName : peer.displayName,
 				picture     : peer.picture
 			}));