diff --git a/app/src/components/Containers/Peer.js b/app/src/components/Containers/Peer.js
index fc79018..5cc1554 100644
--- a/app/src/components/Containers/Peer.js
+++ b/app/src/components/Containers/Peer.js
@@ -519,17 +519,17 @@ Peer.propTypes =
 	theme                    : PropTypes.object.isRequired
 };
 
-const makeMapStateToProps = (initialState, props) =>
+const makeMapStateToProps = (initialState, { id }) =>
 {
 	const getPeerConsumers = makePeerConsumerSelector();
 
 	const mapStateToProps = (state) =>
 	{
 		return {
-			peer           : state.peers[props.id],
-			...getPeerConsumers(state, props),
+			peer           : state.peers[id],
+			...getPeerConsumers(state, id),
 			windowConsumer : state.room.windowConsumer,
-			activeSpeaker  : props.id === state.room.activeSpeakerId
+			activeSpeaker  : id === state.room.activeSpeakerId
 		};
 	};
 
diff --git a/app/src/components/Containers/SpeakerPeer.js b/app/src/components/Containers/SpeakerPeer.js
index 011b93c..fa3300b 100644
--- a/app/src/components/Containers/SpeakerPeer.js
+++ b/app/src/components/Containers/SpeakerPeer.js
@@ -190,13 +190,13 @@ SpeakerPeer.propTypes =
 	classes        : PropTypes.object.isRequired
 };
 
-const mapStateToProps = (state, props) =>
+const mapStateToProps = (state, { id }) =>
 {
 	const getPeerConsumers = makePeerConsumerSelector();
 
 	return {
-		peer : state.peers[props.id],
-		...getPeerConsumers(state, props)
+		peer : state.peers[id],
+		...getPeerConsumers(state, id)
 	};
 };
 
diff --git a/app/src/components/MeetingViews/Filmstrip.js b/app/src/components/MeetingViews/Filmstrip.js
index fde6515..0403ce4 100644
--- a/app/src/components/MeetingViews/Filmstrip.js
+++ b/app/src/components/MeetingViews/Filmstrip.js
@@ -319,7 +319,7 @@ const mapStateToProps = (state) =>
 		myId             : state.me.id,
 		spotlights       : state.room.spotlights,
 		spotlightsLength : spotlightsLengthSelector(state),
-		boxes            : videoBoxesSelector(state),
+		boxes            : videoBoxesSelector(state)
 	};
 };
 
diff --git a/app/src/components/Selectors.js b/app/src/components/Selectors.js
index d3e293d..966fd9b 100644
--- a/app/src/components/Selectors.js
+++ b/app/src/components/Selectors.js
@@ -5,8 +5,8 @@ const consumersSelect = (state) => state.consumers;
 const spotlightsSelector = (state) => state.room.spotlights;
 const peersSelector = (state) => state.peers;
 const lobbyPeersSelector = (state) => state.lobbyPeers;
-const getPeerConsumers = (state, props) =>
-	(state.peers[props.id] ? state.peers[props.id].consumers : null);
+const getPeerConsumers = (state, id) =>
+	(state.peers[id] ? state.peers[id].consumers : null);
 const getAllConsumers = (state) => state.consumers;
 const peersKeySelector = createSelector(
 	peersSelector,
@@ -70,12 +70,12 @@ export const spotlightsLengthSelector = createSelector(
 
 export const spotlightPeersSelector = createSelector(
 	spotlightsSelector,
-	peersSelector,
+	peersKeySelector,
 	(spotlights, peers) =>
-		spotlights.reduce((result, peerId) =>
+		peers.reduce((result, peerId) =>
 		{
-			if (peers[peerId])
-				result.push(peers[peerId]);
+			if (spotlights.includes(peerId))
+				result.push(peerId);
 
 			return result;
 		}, [])