diff --git a/src/hooks/useOnSetDefaultVariant.ts b/src/hooks/useOnSetDefaultVariant.ts
index d11e16894..ededc9819 100644
--- a/src/hooks/useOnSetDefaultVariant.ts
+++ b/src/hooks/useOnSetDefaultVariant.ts
@@ -26,14 +26,19 @@ function useOnSetDefaultVariant(
           })
         );
       } else {
-        if (variant) {
+        const defaultVariant = data.productVariantSetDefault.product.variants.find(
+          variant =>
+            variant.id ===
+            data.productVariantSetDefault.product.defaultVariant.id
+        );
+        if (defaultVariant) {
           notify({
             status: "success",
             text: intl.formatMessage(
               {
                 defaultMessage: "Variant {name} has been set as default."
               },
-              { name: variant.name }
+              { name: defaultVariant.name }
             )
           });
         }
diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
index 13e56879d..8160eff20 100644
--- a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
+++ b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
@@ -86,7 +86,7 @@ export interface ProductUpdatePageProps extends ListActions {
   onSeoClick?();
   onSubmit?(data: ProductUpdatePageSubmitData);
   onVariantAdd?();
-  onSetDefaultVariant();
+  onSetDefaultVariant(variant: ProductDetails_product_variants);
   onWarehouseConfigure();
 }