diff --git a/packages/atlas/src/views/studio/StudioLayout.tsx b/packages/atlas/src/views/studio/StudioLayout.tsx
index eaf5d44960..cc0d5b359a 100644
--- a/packages/atlas/src/views/studio/StudioLayout.tsx
+++ b/packages/atlas/src/views/studio/StudioLayout.tsx
@@ -260,7 +260,15 @@ const _StudioLayout = () => {
               </Routes>
             </Suspense>
           </MainContainer>
-          {channelSet && <VideoWorkspace />}
+          <Suspense
+            fallback={
+              <LoadingStudioContainer>
+                <Spinner size="large" />
+              </LoadingStudioContainer>
+            }
+          >
+            {channelSet && <VideoWorkspace />}
+          </Suspense>
         </>
       )}
     </>