diff --git a/packages/manager/apps/key-management-service/src/pages/credential/create/generalInformations/CreateGeneralInformationsValidity.tsx b/packages/manager/apps/key-management-service/src/pages/credential/create/generalInformations/CreateGeneralInformationsValidity.tsx
index dababc56da6c..2f90a76c7965 100644
--- a/packages/manager/apps/key-management-service/src/pages/credential/create/generalInformations/CreateGeneralInformationsValidity.tsx
+++ b/packages/manager/apps/key-management-service/src/pages/credential/create/generalInformations/CreateGeneralInformationsValidity.tsx
@@ -54,6 +54,7 @@ const CreateGeneralInformationsValidity = ({
     if (validityPresetPeriod !== -1) {
       setValidity(validityPresetPeriod);
     } else {
+      if (!validityDatepicker) return;
       setValidity(getDaysFromDate(validityDatepicker));
     }
   }, [validityPresetPeriod, validityDatepicker]);