diff --git a/src/frontend/src/features/rooms/routes/Room.tsx b/src/frontend/src/features/rooms/routes/Room.tsx
index 5dab908e..83de6cbf 100644
--- a/src/frontend/src/features/rooms/routes/Room.tsx
+++ b/src/frontend/src/features/rooms/routes/Room.tsx
@@ -32,16 +32,14 @@ export const Room = () => {
   }
 
   return (
-    <Screen>
-      <Conference
-        roomId={roomId}
-        mode={mode}
-        userConfig={{
-          ...existingUserChoices,
-          ...(skipJoinScreen ? { username: user?.email as string } : {}),
-          ...userConfig,
-        }}
-      />
-    </Screen>
+    <Conference
+      roomId={roomId}
+      mode={mode}
+      userConfig={{
+        ...existingUserChoices,
+        ...(skipJoinScreen ? { username: user?.email as string } : {}),
+        ...userConfig,
+      }}
+    />
   )
 }
diff --git a/src/frontend/src/layout/QueryAware.tsx b/src/frontend/src/layout/QueryAware.tsx
index 466d6a7c..b396d697 100644
--- a/src/frontend/src/layout/QueryAware.tsx
+++ b/src/frontend/src/layout/QueryAware.tsx
@@ -1,5 +1,6 @@
 import { ErrorScreen } from './ErrorScreen'
 import { LoadingScreen } from './LoadingScreen'
+import { Screen } from './Screen'
 
 export const QueryAware = ({
   status,
@@ -16,5 +17,5 @@ export const QueryAware = ({
     return <LoadingScreen />
   }
 
-  return children
+  return <Screen>{children}</Screen>
 }