diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 5d14fe7..943cb69 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -95,6 +95,8 @@ export default class RoomClient
 		this._room = null;
 		this._roomId = roomId;
 
+		this._doneJoining = false;
+
 		// Our WebTorrent client
 		this._webTorrent = this._torrentSupport && new WebTorrent({
 			tracker : {
@@ -1259,7 +1261,10 @@ export default class RoomClient
 
 			this._soundNotification();
 
-			this._handlePeer(peer);
+			if (this._doneJoining)
+			{
+				this._handlePeer(peer);
+			}
 		});
 
 		try
@@ -1341,6 +1346,8 @@ export default class RoomClient
 				this._handlePeer(peer, { notify: false });
 			}
 
+			this._doneJoining = true;
+
 			this._spotlights.start();
 		}
 		catch (error)