diff --git a/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue b/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue
index 193f13928..d7a57ce8f 100644
--- a/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue
+++ b/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue
@@ -3,8 +3,7 @@
     <BaseDialog v-if="shoppingListDialog" v-model="dialog" :title="$t('recipe.add-to-list')" :icon="$globals.icons.cartCheck">
       <v-card-text>
         <v-card
-          v-for="list in shoppingLists"
-          v-if="showAll || $auth.user && $auth.user.id == list.userId"
+          v-for="list in shoppingListChoices"
           :key="list.id"
           hover
           class="my-2 left-border"
@@ -177,7 +176,7 @@ export default defineComponent({
     },
   },
   setup(props, context) {
-    const { i18n } = useContext();
+    const { $auth, i18n } = useContext();
     const api = useUserApi();
 
     // v-model support
@@ -197,6 +196,10 @@ export default defineComponent({
       showAll: false,
     });
 
+    const shoppingListChoices = computed(() => {
+      return props.shoppingLists.filter((list) => state.showAll || list.userId === $auth.user?.id);
+    });
+
     const recipeIngredientSections = ref<ShoppingListRecipeIngredientSection[]>([]);
     const selectedShoppingList = ref<ShoppingListSummary | null>(null);
 
@@ -348,6 +351,7 @@ export default defineComponent({
 
     return {
       dialog,
+      shoppingListChoices,
       ...toRefs(state),
       addRecipesToList,
       bulkCheckIngredients,
diff --git a/frontend/pages/shopping-lists/index.vue b/frontend/pages/shopping-lists/index.vue
index 3945e7ad4..19ac10db8 100644
--- a/frontend/pages/shopping-lists/index.vue
+++ b/frontend/pages/shopping-lists/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container v-if="shoppingLists" class="narrow-container">
+  <v-container v-if="shoppingListChoices" class="narrow-container">
     <BaseDialog v-model="createDialog" :title="$tc('shopping-list.create-shopping-list')" @submit="createOne">
       <v-card-text>
         <v-text-field v-model="createName" autofocus :label="$t('shopping-list.new-list')"> </v-text-field>
@@ -23,8 +23,7 @@
 
     <section>
       <v-card
-        v-for="list in shoppingLists"
-        v-if="showAll || ($auth.user && $auth.user.id == list.userId)"
+        v-for="list in shoppingListChoices"
         :key="list.id"
         class="my-2 left-border"
         :to="`/shopping-lists/${list.id}`"
@@ -73,6 +72,14 @@ export default defineComponent({
       return await fetchShoppingLists();
     }, useAsyncKey());
 
+    const shoppingListChoices = computed(() => {
+      if (!shoppingLists.value) {
+        return [];
+      }
+
+      return shoppingLists.value.filter((list) => state.showAll || list.userId === $auth.user?.id);
+    });
+
     async function fetchShoppingLists() {
       const { data } = await userApi.shopping.lists.getAll(1, -1, { orderBy: "name", orderDirection: "asc" });
 
@@ -111,7 +118,7 @@ export default defineComponent({
     return {
       ...toRefs(state),
       groupSlug,
-      shoppingLists,
+      shoppingListChoices,
       createOne,
       deleteOne,
       openDelete,