diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index da427f2a1..676e2428f 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -33,7 +33,7 @@
       </router-link>
       <div class="item right actions">
         <search-bar
-          v-if="currentUser || !privateMode"
+          v-if="currentUser || !private"
           @toggled="onSearchBarToggled"
           @click.stop
         />
diff --git a/src/components/lists_menu/lists_menu_content.js b/src/components/lists_menu/lists_menu_content.js
index 2279ca6f0..49b413b4f 100644
--- a/src/components/lists_menu/lists_menu_content.js
+++ b/src/components/lists_menu/lists_menu_content.js
@@ -16,10 +16,9 @@ export const ListsMenuContent = {
     ...mapPiniaState(useListsStore, {
       lists: getListEntries,
     }),
+    ...mapPiniaState(useInstanceStore, ['private','federating']),
     ...mapState({
       currentUser: (state) => state.users.currentUser,
-      privateMode: (state) => useInstanceStore().private,
-      federating: (state) => useInstanceStore().federating,
     }),
   },
 }
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 5ea5faef3..eb10c8148 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -112,8 +112,9 @@ const NavPanel = {
       unreadAnnouncementCount: 'unreadAnnouncementCount',
       supportsAnnouncements: (store) => store.supportsAnnouncements,
     }),
-    ...mapPiniaState(useInstanceStore, ['private', 'federating']),
+    ...mapPiniaState(useInstanceStore, ['federating']),
     ...mapPiniaState(useInstanceStore, {
+      privateMode: (store) => store.private,
       pleromaChatMessagesAvailable: (store) =>
         store.featureSet.pleromaChatMessagesAvailable,
       bookmarkFolders: (store) =>
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index 0f7b06990..40fcdc23d 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -79,12 +79,6 @@ const SideDrawer = {
     followRequestCount() {
       return this.$store.state.api.followRequests.length
     },
-    privateMode() {
-      return useInstanceStore().private
-    },
-    federating() {
-      return useInstanceStore().federating
-    },
     timelinesRoute() {
       let name
       if (useInterfaceStore().lastTimeline) {
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index c034edf91..0db39d43f 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -47,7 +47,7 @@
           </router-link>
         </li>
         <li
-          v-if="currentUser || !privateMode"
+          v-if="currentUser || !private"
           @click="toggleDrawer"
         >
           <router-link
@@ -166,7 +166,7 @@
       </ul>
       <ul>
         <li
-          v-if="currentUser || !privateMode"
+          v-if="currentUser || !private"
           @click="toggleDrawer"
         >
           <router-link