diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js
index dc46f5e6f..106da1487 100644
--- a/src/components/features_panel/features_panel.js
+++ b/src/components/features_panel/features_panel.js
@@ -3,17 +3,18 @@ import { mapState } from 'pinia'
 import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'
+import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 
 const FeaturesPanel = {
   computed: {
+    ...mapState(useInstanceCapabilitiesStore, [
+      'shoutAvailable',
+      'pleromaChatMessagesAvailable',
+      'gopherAvailable',
+      'suggestionsEnabled',
+      'mediaProxyAvailable',
+    ]),
     ...mapState(useInstanceStore, {
-      shout: (store) => store.shoutAvailable,
-      pleromaChatMessages: (store) =>
-        store.featureSet.pleromaChatMessagesAvailable,
-      gopher: (store) => store.featureSet.gopherAvailable,
-      whoToFollow: (store) => store.featureSet.suggestionsEnabled,
-      mediaProxy: (store) => store.featureSet.mediaProxyAvailable,
-      minimalScopesMode: (store) => store.prefsStorage.minimalScopesMode,
       textlimit: (store) => store.limits.textlimit,
       uploadlimit: (store) =>
         fileSizeFormatService.fileSizeFormat(store.limits.uploadlimit),
diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue
index d91ef1eff..3c6064a7e 100644
--- a/src/components/features_panel/features_panel.vue
+++ b/src/components/features_panel/features_panel.vue
@@ -8,19 +8,22 @@
       </div>
       <div class="panel-body">
         <ul>
+          <li v-if="shoutAvailable">
+            {{ $t('features_panel.shout') }}
+          </li>
           <li v-if="shout">
             {{ $t('features_panel.shout') }}
           </li>
-          <li v-if="pleromaChatMessages">
+          <li v-if="pleromaChatMessagesAvailable">
             {{ $t('features_panel.pleroma_chat_messages') }}
           </li>
-          <li v-if="gopher">
+          <li v-if="gopherAvailable">
             {{ $t('features_panel.gopher') }}
           </li>
-          <li v-if="whoToFollow">
+          <li v-if="suggestionsEnabled">
             {{ $t('features_panel.who_to_follow') }}
           </li>
-          <li v-if="mediaProxy">
+          <li v-if="mediaProxyAvailable">
             {{ $t('features_panel.media_proxy') }}
           </li>
           <li>{{ $t('features_panel.scope_options') }}</li>