diff --git a/src/products/components/ProductVariantPage/ProductVariantPage.tsx b/src/products/components/ProductVariantPage/ProductVariantPage.tsx
index 29426bab7..37de14fb9 100644
--- a/src/products/components/ProductVariantPage/ProductVariantPage.tsx
+++ b/src/products/components/ProductVariantPage/ProductVariantPage.tsx
@@ -235,7 +235,7 @@ const ProductVariantPage: React.FC<ProductVariantPageProps> = ({
                     <ProductVariantNavigation
                       current={variant?.id}
                       defaultVariantId={defaultVariantId}
-                      fallbackThumbnail={variant?.product?.thumbnail.url}
+                      fallbackThumbnail={variant?.product?.thumbnail?.url}
                       variants={variant?.product.variants}
                       onAdd={onAdd}
                       onRowClick={(variantId: string) => {
diff --git a/src/products/views/ProductUpdate/ProductUpdate.tsx b/src/products/views/ProductUpdate/ProductUpdate.tsx
index 06388481b..a61e69d15 100644
--- a/src/products/views/ProductUpdate/ProductUpdate.tsx
+++ b/src/products/views/ProductUpdate/ProductUpdate.tsx
@@ -389,9 +389,6 @@ export const ProductUpdate: React.FC<ProductUpdateProps> = ({ id, params }) => {
 
   const handleBack = () => navigate(productListUrl());
 
-  if (product === null) {
-    return <NotFoundPage onBack={handleBack} />;
-  }
   const handleVariantAdd = () => navigate(productVariantAddUrl(id));
   const handleVariantsAdd = () => navigate(productVariantCreatorUrl(id));
 
@@ -520,6 +517,10 @@ export const ProductUpdate: React.FC<ProductUpdateProps> = ({ id, params }) => {
     onFetchMore: loadMoreAttributeValues
   };
 
+  if (product === null) {
+    return <NotFoundPage onBack={handleBack} />;
+  }
+
   return (
     <>
       <WindowTitle title={data?.product?.name} />
diff --git a/src/products/views/ProductVariant.tsx b/src/products/views/ProductVariant.tsx
index 832910f88..3dbfcefdb 100644
--- a/src/products/views/ProductVariant.tsx
+++ b/src/products/views/ProductVariant.tsx
@@ -197,10 +197,6 @@ export const ProductVariant: React.FC<ProductUpdateProps> = ({
   const variant = data?.productVariant;
   const channels = createVariantChannels(variant);
 
-  if (variant === null) {
-    return <NotFoundPage onBack={handleBack} />;
-  }
-
   const [
     deactivatePreorder,
     deactivatePreoderOpts
@@ -360,6 +356,10 @@ export const ProductVariant: React.FC<ProductUpdateProps> = ({
   const attributeValues =
     mapEdgesToItems(searchAttributeValuesOpts?.data?.attribute.choices) || [];
 
+  if (variant === null) {
+    return <NotFoundPage onBack={handleBack} />;
+  }
+
   return (
     <>
       <WindowTitle title={data?.productVariant?.name} />