diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 128c56b..47a04af 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -324,8 +324,11 @@ export default class RoomClient
 
 		const { displayName, picture } = data;
 
-		this.changeDisplayName(displayName);
-		this.changeProfilePicture(picture);
+		if (store.getState().room.joined)
+		{
+			this.changeDisplayName(displayName);
+			this.changeProfilePicture(picture);
+		}
 
 		store.dispatch(stateActions.setPicture(picture));
 		store.dispatch(stateActions.loggedIn());
diff --git a/server/server.js b/server/server.js
index be40826..839029f 100755
--- a/server/server.js
+++ b/server/server.js
@@ -280,7 +280,7 @@ async function setupAuth(oidcIssuer)
 
 			const room = rooms.get(state.roomId);
 
-			room.peerAuthenticated(state.peerId);
+			room && room.peerAuthenticated(state.peerId);
 
 			res.send(httpHelper({
 				success     : true,