diff --git a/components/actors/tile.vue b/components/actors/tile.vue
index 940a48a..bf8e603 100644
--- a/components/actors/tile.vue
+++ b/components/actors/tile.vue
@@ -89,9 +89,9 @@ const props = defineProps({
 const pageContext = inject('pageContext');
 const { user } = pageContext;
 const pageStash = pageContext.pageProps.stash;
-const currentStash = pageStash || user?.primaryStash;
+const currentStash = pageStash || pageContext.assets?.primaryStash;
 
-const favorited = ref(props.actor.stashes.some((actorStash) => actorStash.id === currentStash.id));
+const favorited = ref(props.actor.stashes.some((actorStash) => actorStash.id === currentStash?.id));
 </script>
 
 <style scoped>
diff --git a/components/movies/tile.vue b/components/movies/tile.vue
index 06135f1..449c0e4 100644
--- a/components/movies/tile.vue
+++ b/components/movies/tile.vue
@@ -140,11 +140,11 @@ const props = defineProps({
 const pageContext = inject('pageContext');
 const user = pageContext.user;
 const pageStash = pageContext.pageProps.stash;
-const currentStash = pageStash || user?.primaryStash;
+const currentStash = pageStash || pageContext.assets?.primaryStash;
 
 const currentYear = new Date().getFullYear();
 
-const favorited = ref(props.movie.stashes?.some((movieStash) => movieStash.id === currentStash.id));
+const favorited = ref(props.movie.stashes?.some((movieStash) => movieStash.id === currentStash?.id));
 </script>
 
 <style scoped>