diff --git a/src/stores/index.js b/src/stores/index.js
index c102c107..223f2336 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -49,7 +49,12 @@ pinia.use(
                 // @ts-ignore
                 ...state.User,
                 currentUser: null,
-                subsetOfLanguages: null
+                subsetOfLanguages: null,
+                languageDialog: {
+                    // @ts-ignore
+                    ...state.User.languageDialog,
+                    languages: null
+                }
             },
             GameLog: {
                 // @ts-ignore
@@ -71,6 +76,12 @@ pinia.use(
                 // @ts-ignore
                 ...state.SharedFeed,
                 sharedFeed: null
+            },
+            Group: {
+                // @ts-ignore
+                ...state.Group,
+                groupInstances: null,
+                inGameGroupOrder: null
             }
         })
     })
diff --git a/src/views/Favorites/components/FavoritesWorldTab.vue b/src/views/Favorites/components/FavoritesWorldTab.vue
index dfd4835b..088d9563 100644
--- a/src/views/Favorites/components/FavoritesWorldTab.vue
+++ b/src/views/Favorites/components/FavoritesWorldTab.vue
@@ -254,21 +254,6 @@
     const worker = ref(null);
     const refreshCancelToken = ref(null);
 
-    const groupedByGroupKeyFavoriteWorlds = computed(() => {
-        const groupedByGroupKeyFavoriteWorlds = {};
-
-        favoriteWorlds.value.forEach((world) => {
-            if (world.groupKey) {
-                if (!groupedByGroupKeyFavoriteWorlds[world.groupKey]) {
-                    groupedByGroupKeyFavoriteWorlds[world.groupKey] = [];
-                }
-                groupedByGroupKeyFavoriteWorlds[world.groupKey].push(world);
-            }
-        });
-
-        return groupedByGroupKeyFavoriteWorlds;
-    });
-
     const sliceLocalWorldFavorites = computed(() => {
         return (group) => {
             return localWorldFavorites.value[group].slice(0, sliceLocalWorldFavoritesLoadMoreNumber.value);
@@ -277,8 +262,19 @@
 
     const sliceWorldFavorites = computed(() => {
         return (group) => {
-            if (groupedByGroupKeyFavoriteWorlds.value[group]) {
-                return groupedByGroupKeyFavoriteWorlds.value[group].slice(0, sliceWorldFavoritesLoadMoreNumber.value);
+            const groupedByGroupKeyFavoriteWorlds = {};
+
+            favoriteWorlds.value.forEach((world) => {
+                if (world.groupKey) {
+                    if (!groupedByGroupKeyFavoriteWorlds[world.groupKey]) {
+                        groupedByGroupKeyFavoriteWorlds[world.groupKey] = [];
+                    }
+                    groupedByGroupKeyFavoriteWorlds[world.groupKey].push(world);
+                }
+            });
+
+            if (groupedByGroupKeyFavoriteWorlds[group]) {
+                return groupedByGroupKeyFavoriteWorlds[group].slice(0, sliceWorldFavoritesLoadMoreNumber.value);
             }
             return [];
         };