diff --git a/ui.apps/src/main/content/jcr_root/apps/commerce/ui/components/productdata/clientlibs/js/productdata.js b/ui.apps/src/main/content/jcr_root/apps/commerce/ui/components/productdata/clientlibs/js/productdata.js
index 62e42be..d8e5d0d 100644
--- a/ui.apps/src/main/content/jcr_root/apps/commerce/ui/components/productdata/clientlibs/js/productdata.js
+++ b/ui.apps/src/main/content/jcr_root/apps/commerce/ui/components/productdata/clientlibs/js/productdata.js
@@ -25,7 +25,7 @@
             let skuField = e.target;
             const roleField = skuField.nextElementSibling;
             let orderField = roleField;
-            if (orderField?.classList.contains("commerce-product-order")) {
+            if (orderField && orderField.classList.contains("commerce-product-order")) {
                 orderField.value = orderField.value || -1;
             }