diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index 7f547d347a1e390b8bc02204fefd412fb293143e..0760f87d214184c8b53e4bddd7777ea379d2d3d2 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -50,23 +50,33 @@ const status = {
     },
     async FetchStatuses({ commit, getters }, { godmode, localOnly }) {
       commit('SET_LOADING', true)
-      await fetchStatuses({ godmode, localOnly, authHost: getters.authHost, token: getters.token })
+      const statuses = await fetchStatuses({ godmode, localOnly, authHost: getters.authHost, token: getters.token })
+      commit('SET_STATUSES_BY_INSTANCE', statuses.data)
       commit('SET_LOADING', false)
     },
-    async FetchStatusesByInstance({ commit, getters, state }) {
+    async FetchStatusesByInstance({ commit, getters, state, rootState }) {
       commit('SET_LOADING', true)
-      const statuses = state.statusesByInstance.selectedInstance === ''
-        ? { data: [] }
-        : await fetchStatusesByInstance(
-          {
-            instance: state.statusesByInstance.selectedInstance,
-            authHost: getters.authHost,
-            token: getters.token,
-            pageSize: state.statusesByInstance.pageSize,
-            page: state.statusesByInstance.page
-          })
-
-      commit('SET_STATUSES_BY_INSTANCE', statuses.data)
+      if (state.statusesByInstance.selectedInstance === '') {
+        commit('SET_STATUSES_BY_INSTANCE', [])
+      } else {
+        const statuses = state.statusesByInstance.selectedInstance === rootState.user.authHost
+          ? await fetchStatuses(
+            {
+              godmode: false,
+              localOnly: false,
+              authHost: getters.authHost,
+              token: getters.token
+            })
+          : await fetchStatusesByInstance(
+            {
+              instance: state.statusesByInstance.selectedInstance,
+              authHost: getters.authHost,
+              token: getters.token,
+              pageSize: state.statusesByInstance.pageSize,
+              page: state.statusesByInstance.page
+            })
+        commit('SET_STATUSES_BY_INSTANCE', statuses.data)
+      }
       commit('SET_LOADING', false)
     },
     async FetchStatusesPageByInstance({ commit, getters, state }) {
diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue
index 7ecd649f9ac5fd3119f842c6b1da47eea17bddff..fe9d9345493a21551773b7a301274b625c37f19d 100644
--- a/src/views/statuses/index.vue
+++ b/src/views/statuses/index.vue
@@ -22,6 +22,7 @@
         :selected-users="selectedUsers"
         @apply-action="clearSelection"/>
     </div>
+    <p v-if="statuses.length === 0" class="no-statuses">{{ $t('userProfile.noStatuses') }}</p>
     <div v-for="status in statuses" :key="status.id" class="status-container">
       <status
         :status="status"
@@ -52,7 +53,7 @@ export default {
   },
   computed: {
     instances() {
-      return ['Local statuses', ...this.$store.state.peers.fetchedPeers]
+      return [this.$store.state.user.authHost, ...this.$store.state.peers.fetchedPeers]
     },
     isDesktop() {
       return this.$store.state.app.device === 'desktop'