diff --git a/apps/storefront/src/components/pages/product/review/ProductReview.tsx b/apps/storefront/src/components/pages/product/review/ProductReview.tsx
index 54caf54..daf6625 100644
--- a/apps/storefront/src/components/pages/product/review/ProductReview.tsx
+++ b/apps/storefront/src/components/pages/product/review/ProductReview.tsx
@@ -15,6 +15,7 @@ import {
 	ProductReview as IProductReview,
 	ReviewSummaryResponse,
 	useAllReviewsQuery,
+	useMeQuery,
 	useReviewByUserAndProductQuery,
 	useReviewSummaryQuery,
 	useReviewsQuery,
@@ -232,10 +233,12 @@ interface ReviewFormProps extends ButtonProps {
 
 export const CreateReviewButton = ({ productId, ...rest }: ReviewFormProps) => {
 	const modalRef: any = useRef();
+	const { data: user, loading: userLoading, error: userError } = useMeQuery();
 	const { data, loading, error } = useReviewByUserAndProductQuery({
 		variables: {
 			productId,
 		},
+		skip: !user?.me?.id,
 	});
 
 	const closeModal = () => {
@@ -244,7 +247,7 @@ export const CreateReviewButton = ({ productId, ...rest }: ReviewFormProps) => {
 		}
 	};
 
-	if (loading) {
+	if (loading || userLoading) {
 		return (
 			<Button colorScheme="blue" px={12} size="xl" isLoading>
 				Write a review
@@ -252,13 +255,17 @@ export const CreateReviewButton = ({ productId, ...rest }: ReviewFormProps) => {
 		);
 	}
 
-	if (error)
+	if (!userLoading && !user?.me?.id) {
+		return null;
+	}
+
+	if (error || userError)
 		return (
 			<Result
-				heading={error.name}
+				heading={error ? error.name : userError?.name!}
 				type="error"
-				text={error.message}
-				dump={error.stack}
+				text={error ? error.message : userError?.message!}
+				dump={error ? error.stack : userError?.stack}
 			/>
 		);
 
diff --git a/apps/storefront/src/pages/products/favourite.tsx b/apps/storefront/src/pages/products/favourite.tsx
index c7de58d..8bbd257 100644
--- a/apps/storefront/src/pages/products/favourite.tsx
+++ b/apps/storefront/src/pages/products/favourite.tsx
@@ -7,6 +7,7 @@ import Rating from "@/components/shared/product/Rating";
 import {
 	Favourite,
 	useFavouritesWithProductQuery,
+	useMeQuery,
 	useRemoveFromFavouriteMutation,
 } from "@/generated/graphql";
 import {
@@ -29,15 +30,18 @@ import Image from "next/image";
 import services from "../../../public/assets/services.svg";
 
 const FavouritePage = () => {
-	const { data, loading, error } = useFavouritesWithProductQuery();
+	const { data: user, loading: userLoading, error: userError } = useMeQuery();
+	const { data, loading, error } = useFavouritesWithProductQuery({
+		skip: !user?.me?.id,
+	});
 
-	if (error) {
+	if (error || userError) {
 		return (
 			<Result
-				heading={error.name}
+				heading={error ? error.name : userError?.name!}
 				type="error"
-				text={error.message}
-				dump={error.stack}
+				text={error ? error.message : userError?.message!}
+				dump={error ? error.stack : userError?.stack}
 			/>
 		);
 	}
@@ -63,7 +67,7 @@ const FavouritePage = () => {
 					rowGap={{ base: "8", md: "10" }}
 				>
 					{/* eslint-disable-next-line no-nested-ternary */}
-					{loading ? (
+					{loading || userLoading ? (
 						Array(4)
 							.fill("favourite-skeleton")
 							.map((mock, index) => (