diff --git a/packages/core/src/layout/Sidebar/Sidebar.stories.tsx b/packages/core/src/layout/Sidebar/Sidebar.stories.tsx
index ec5746d428..0710be4566 100644
--- a/packages/core/src/layout/Sidebar/Sidebar.stories.tsx
+++ b/packages/core/src/layout/Sidebar/Sidebar.stories.tsx
@@ -26,18 +26,8 @@ import {
 import HomeOutlinedIcon from '@material-ui/icons/HomeOutlined';
 import AddCircleOutlineIcon from '@material-ui/icons/AddCircleOutline';
 import { MemoryRouter } from 'react-router-dom';
-import {
-  ApiProvider,
-  ApiRegistry,
-  appThemeApiRef,
-  AppThemeSelector,
-  configApiRef,
-  ConfigReader,
-  FeatureFlags,
-  featureFlagsApiRef,
-} from '@backstage/core-api';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { UserSettings } from '@backstage/plugin-user-settings';
+import { Settings as SidebarSettings } from '@backstage/plugin-user-settings';
 
 export default {
   title: 'Sidebar',
@@ -67,28 +57,6 @@ export const SampleSidebar = () => (
   </Sidebar>
 );
 
-const createConfig = () =>
-  ConfigReader.fromConfigs([
-    {
-      context: '',
-      data: {
-        auth: {
-          providers: {
-            google: { development: {} },
-          },
-        },
-      },
-    },
-  ]);
-
-const config = createConfig();
-
-const apis = ApiRegistry.from([
-  [configApiRef, config],
-  [featureFlagsApiRef, new FeatureFlags()],
-  [appThemeApiRef, AppThemeSelector.createWithStorage([])],
-]);
-
 export const WithUserSettingsPlugin = () => (
   <Sidebar>
     <SidebarSearchField onSearch={handleSearch} />
@@ -100,8 +68,6 @@ export const WithUserSettingsPlugin = () => (
     <SidebarIntro />
     <SidebarSpace />
     <SidebarDivider />
-    <ApiProvider apis={apis}>
-      <UserSettings />
-    </ApiProvider>
+    <SidebarSettings />
   </Sidebar>
 );
diff --git a/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx b/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx
index 8ffd042543..901347645e 100644
--- a/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx
@@ -9,7 +9,7 @@ import { Link, makeStyles } from '@material-ui/core';
 import { NavLink } from 'react-router-dom';
 import LogoFull from './LogoFull';
 import LogoIcon from './LogoIcon';
-import { UserSettings } from '@backstage/plugin-user-settings'
+import { Settings as SidebarSettings } from '@backstage/plugin-user-settings';
 
 import {
   Sidebar,
@@ -36,7 +36,7 @@ export const AppSidebar = () => (
     <SidebarDivider />
     <SidebarSpace />
     <SidebarDivider />
-    <UserSettings />
+    <SidebarSettings />
   </Sidebar>
 );