diff --git a/libs/ui-lib/lib/common/components/ui/OpenShiftVersionModal.tsx b/libs/ui-lib/lib/common/components/ui/OpenShiftVersionModal.tsx
index 0809b30213..7b5b212d84 100644
--- a/libs/ui-lib/lib/common/components/ui/OpenShiftVersionModal.tsx
+++ b/libs/ui-lib/lib/common/components/ui/OpenShiftVersionModal.tsx
@@ -51,7 +51,9 @@ export const OpenShiftVersionModal = ({
           key="select-custom-ocp"
           variant={ButtonVariant.primary}
           onClick={() => {
-            setFieldValue('openshiftVersion', values.customOpenshiftSelect);
+            if (values.customOpenshiftSelect !== null) {
+              setFieldValue('openshiftVersion', values.customOpenshiftSelect);
+            }
             onClose();
           }}
         >