diff --git a/react/features/base/tracks/functions.js b/react/features/base/tracks/functions.js
index 60b46ddd4..4a6c55006 100644
--- a/react/features/base/tracks/functions.js
+++ b/react/features/base/tracks/functions.js
@@ -320,7 +320,7 @@ export function getTrackByMediaTypeAndParticipant(
         mediaType,
         participantId) {
     return tracks.find(
-        t => t.participantId === participantId && t.mediaType === mediaType
+        t => Boolean(t.jitsiTrack) && t.participantId === participantId && t.mediaType === mediaType
     );
 }
 
diff --git a/react/features/prejoin/middleware.js b/react/features/prejoin/middleware.js
index fc436ae8c..efe3479c7 100644
--- a/react/features/prejoin/middleware.js
+++ b/react/features/prejoin/middleware.js
@@ -46,7 +46,9 @@ MiddlewareRegistry.register(store => next => async action => {
             await dispatch(replaceLocalTrack(localVideoTrack.jitsiTrack, null));
         }
 
-        const jitsiTracks = getState()['features/base/tracks'].map(t => t.jitsiTrack);
+        const jitsiTracks = getState()['features/base/tracks']
+            .map(t => t.jitsiTrack)
+            .filter(t => Boolean(t)); // Filter out GUM in progress tracks...
 
         dispatch(setPrejoinPageVisibility(false));
         APP.conference.prejoinStart(jitsiTracks);