diff --git a/packages/roomkit-react/src/Prebuilt/components/AppData/AppData.tsx b/packages/roomkit-react/src/Prebuilt/components/AppData/AppData.tsx
index 0b6e006088..9886acbf47 100644
--- a/packages/roomkit-react/src/Prebuilt/components/AppData/AppData.tsx
+++ b/packages/roomkit-react/src/Prebuilt/components/AppData/AppData.tsx
@@ -125,7 +125,7 @@ export const AppData = React.memo(() => {
         ? DEFAULT_TILES_IN_VIEW.MWEB
         : Number(elements?.video_tile_layout?.grid?.tiles_in_view) || DEFAULT_TILES_IN_VIEW.DESKTOP,
     };
-    hmsActions.setAppData(APP_DATA.uiSettings, updatedSettings, true);
+    hmsActions.setAppData(APP_DATA.uiSettings, updatedSettings, false);
   }, [preferences, hmsActions, elements?.video_tile_layout, isMobile]);
 
   useEffect(() => {
diff --git a/packages/roomkit-react/src/Prebuilt/components/Settings/LayoutSettings.tsx b/packages/roomkit-react/src/Prebuilt/components/Settings/LayoutSettings.tsx
index 6f2daf133d..52d3c3ec98 100644
--- a/packages/roomkit-react/src/Prebuilt/components/Settings/LayoutSettings.tsx
+++ b/packages/roomkit-react/src/Prebuilt/components/Settings/LayoutSettings.tsx
@@ -41,34 +41,6 @@ export const LayoutSettings = () => {
 
   return (
     <Box className={settingOverflow()}>
-      <Box>
-        {/* <Text variant="md" css={{ fontWeight: '$semiBold' }}>
-          Layout Modes
-        </Text>
-         <RadioGroup.Root
-          css={{ flexDirection: 'column', alignItems: 'start', gap: '$10', my: '$2', py: '$8' }}
-          value={layoutMode}
-          onValueChange={value =>
-            setUISettings({
-              [UI_SETTINGS.layoutMode]: value,
-            })
-          }
-        >
-          {Object.keys(LayoutMode).map(key => {
-            return (
-              <Flex align="center" key={key} css={{ mr: '$8', gap: '$8' }}>
-                <RadioGroup.Item value={LayoutMode[key as LayoutModeKeys]} id={`layoutMode-${key}`} css={{ mr: '$4' }}>
-                  <RadioGroup.Indicator />
-                </RadioGroup.Item>
-                <Label htmlFor={`layoutMode-${key}`} css={{ display: 'flex', gap: '$8', cursor: 'pointer' }}>
-                  {LayoutModeIconMapping[LayoutMode[key as LayoutModeKeys]]}
-                  {LayoutMode[key as LayoutModeKeys]}
-                </Label>
-              </Flex>
-            );
-          })}
-        </RadioGroup.Root> */}
-      </Box>
       <Flex align="center" css={{ w: '100%', my: '$2', py: '$8', '@md': { display: 'none' } }}>
         <Text variant="md" css={{ fontWeight: '$semiBold' }}>
           Tiles In View({maxTileCount})