diff --git a/react/features/large-video/middleware.js b/react/features/large-video/middleware.js
index 7846750b1..fb8ed2e4e 100644
--- a/react/features/large-video/middleware.js
+++ b/react/features/large-video/middleware.js
@@ -38,7 +38,6 @@ MiddlewareRegistry.register(store => next => action => {
 
         break;
     }
-    case CONFERENCE_JOINED:
     case PARTICIPANT_JOINED:
     case PARTICIPANT_LEFT:
     case PIN_PARTICIPANT:
@@ -47,6 +46,13 @@ MiddlewareRegistry.register(store => next => action => {
         store.dispatch(selectParticipantInLargeVideo());
         break;
 
+    case CONFERENCE_JOINED:
+        // Ensure a participant is selected on conference join. This addresses
+        // the case where video tracks were received before CONFERENCE_JOINED
+        // fired; without the conference selection may not happen.
+        store.dispatch(selectParticipant());
+        break;
+
     case TRACK_UPDATED:
         // In order to minimize re-calculations, we need to select participant
         // only if the videoType of the current participant rendered in