diff --git a/src/App.js b/src/App.js
index 4fcfaf2c6..19d28f843 100644
--- a/src/App.js
+++ b/src/App.js
@@ -156,7 +156,7 @@ export default {
         }
       }
     },
-    shout() {
+    shoutJoined() {
       return useShoutStore().joined
     },
     isChats() {
diff --git a/src/App.vue b/src/App.vue
index e5e088bc3..f432d8bc4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -60,8 +60,8 @@
       />
     </div>
     <MediaModal />
-    <shout-panel
-      v-if="currentUser && shout && !hideShoutbox"
+    <ShoutPanel
+      v-if="currentUser && !hideShoutbox && shoutJoined"
       :floating="true"
       class="floating-shout mobile-hidden"
       :class="{ '-left': shoutboxPosition }"
diff --git a/src/modules/api.js b/src/modules/api.js
index d6bf27f23..6f4b8b15f 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -345,7 +345,7 @@ const api = {
       // Set up websocket connection
       const token = state.wsToken
       if (
-        useInstanceStore().shoutAvailable &&
+        useInstanceCapabilitiesStore().shoutAvailable &&
         typeof token !== 'undefined' &&
         state.socket === null
       ) {