diff --git a/dev-client/src/screens/ScreenScaffold.tsx b/dev-client/src/screens/ScreenScaffold.tsx
index 31646d46e..de67b96b3 100644
--- a/dev-client/src/screens/ScreenScaffold.tsx
+++ b/dev-client/src/screens/ScreenScaffold.tsx
@@ -22,7 +22,6 @@ import {SafeAreaView, useSafeAreaInsets} from 'react-native-safe-area-context';
 import {Box, Column} from 'terraso-mobile-client/components/NativeBaseAdapters';
 import {RestrictByFlag} from 'terraso-mobile-client/components/restrictions/RestrictByFlag';
 import {SyncContent} from 'terraso-mobile-client/components/SyncContent';
-import {UiComponentList} from 'terraso-mobile-client/components/util/UiComponentList';
 import {useHeaderHeight} from 'terraso-mobile-client/hooks/useHeaderHeight';
 import {AppBar} from 'terraso-mobile-client/navigation/components/AppBar';
 import {theme} from 'terraso-mobile-client/theme';
@@ -67,7 +66,6 @@ export const ScreenScaffold = ({
       <Column backgroundColor="primary.contrast" flex={1}>
         <View onLayout={onLayout}>{PropsAppBar}</View>
         <RestrictByFlag flag="FF_testing">
-          <UiComponentList />
           <SyncContent />
         </RestrictByFlag>
         <Box flex={1}>{children}</Box>
diff --git a/dev-client/src/screens/UserSettingsScreen/UserSettingsScreen.tsx b/dev-client/src/screens/UserSettingsScreen/UserSettingsScreen.tsx
index 4cfa467ba..21839ce66 100644
--- a/dev-client/src/screens/UserSettingsScreen/UserSettingsScreen.tsx
+++ b/dev-client/src/screens/UserSettingsScreen/UserSettingsScreen.tsx
@@ -18,6 +18,8 @@
 import {FeatureFlagControlPanel} from 'terraso-mobile-client/components/FeatureFlagControl';
 import {MenuList} from 'terraso-mobile-client/components/menus/MenuList';
 import {Column} from 'terraso-mobile-client/components/NativeBaseAdapters';
+import {RestrictByFlag} from 'terraso-mobile-client/components/restrictions/RestrictByFlag';
+import {UiComponentList} from 'terraso-mobile-client/components/util/UiComponentList';
 import {AppBar} from 'terraso-mobile-client/navigation/components/AppBar';
 import {ScreenScaffold} from 'terraso-mobile-client/screens/ScreenScaffold';
 import {DeleteAccountItem} from 'terraso-mobile-client/screens/UserSettingsScreen/components/menu/DeleteAccountItem';
@@ -28,6 +30,9 @@ import {VersionIndicator} from 'terraso-mobile-client/screens/UserSettingsScreen
 export function UserSettingsScreen() {
   return (
     <ScreenScaffold AppBar={<AppBar LeftButton={null} RightButton={null} />}>
+      <RestrictByFlag flag="FF_testing">
+        <UiComponentList />
+      </RestrictByFlag>
       <Column margin="12px">
         <UserIndicator />
         <MenuList>