diff --git a/src/state/CallViewModel.ts b/src/state/CallViewModel.ts
index 31a1fdb3..3d48da22 100644
--- a/src/state/CallViewModel.ts
+++ b/src/state/CallViewModel.ts
@@ -504,7 +504,9 @@ export class CallViewModel extends ViewModel {
                     (grid, spotlight, screenShares): Layout => ({
                       type: "grid",
                       spotlight:
-                        screenShares.length > 0 ? spotlight : undefined,
+                        screenShares.length > 0 || grid.length > 20
+                          ? spotlight
+                          : undefined,
                       grid,
                     }),
                   );