diff --git a/src/products/components/ProductCreatePage/ProductCreatePage.tsx b/src/products/components/ProductCreatePage/ProductCreatePage.tsx
index ed55e6f6d..6010e6428 100644
--- a/src/products/components/ProductCreatePage/ProductCreatePage.tsx
+++ b/src/products/components/ProductCreatePage/ProductCreatePage.tsx
@@ -171,8 +171,7 @@ export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
       value: taxClass.id,
     })) ?? [];
 
-  const canOpenAssignReferencesAttributeDialog =
-    !!assignReferencesAttributeId && !fetchMoreReferenceProducts.loading;
+  const canOpenAssignReferencesAttributeDialog = !!assignReferencesAttributeId;
 
   const handleAssignReferenceAttribute = (
     attributeValues: string[],
@@ -231,6 +230,12 @@ export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
         const isSimpleProduct = data.productType?.hasVariants === false;
 
         const errors = [...apiErrors, ...validationErrors];
+
+        const entityType = getReferenceAttributeEntityTypeFromAttribute(
+          assignReferencesAttributeId,
+          data.attributes,
+        );
+
         return (
           <Container>
             <Backlink href={productListUrl()}>
@@ -387,12 +392,9 @@ export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
               state={saveButtonBarState}
               disabled={isSaveDisabled}
             />
-            {canOpenAssignReferencesAttributeDialog && (
+            {canOpenAssignReferencesAttributeDialog && entityType && (
               <AssignAttributeValueDialog
-                entityType={getReferenceAttributeEntityTypeFromAttribute(
-                  assignReferencesAttributeId,
-                  data.attributes,
-                )}
+                entityType={entityType}
                 confirmButtonState={"default"}
                 products={referenceProducts}
                 pages={referencePages}
diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
index 89709341d..fb0c1060e 100644
--- a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
+++ b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
@@ -199,8 +199,7 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
       value: taxClass.id,
     })) || [];
 
-  const canOpenAssignReferencesAttributeDialog =
-    !!assignReferencesAttributeId && !fetchMoreReferenceProducts.loading;
+  const canOpenAssignReferencesAttributeDialog = !!assignReferencesAttributeId;
 
   const handleAssignReferenceAttribute = (
     attributeValues: string[],
@@ -310,6 +309,11 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
           },
         );
 
+        const entityType = getReferenceAttributeEntityTypeFromAttribute(
+          assignReferencesAttributeId,
+          data.attributes,
+        );
+
         return (
           <>
             <Container>
@@ -439,12 +443,9 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
                 state={saveButtonBarState}
                 disabled={isSaveDisabled}
               />
-              {canOpenAssignReferencesAttributeDialog && (
+              {canOpenAssignReferencesAttributeDialog && entityType && (
                 <AssignAttributeValueDialog
-                  entityType={getReferenceAttributeEntityTypeFromAttribute(
-                    assignReferencesAttributeId,
-                    data.attributes,
-                  )}
+                  entityType={entityType}
                   confirmButtonState={"default"}
                   products={referenceProducts}
                   pages={referencePages}