diff --git a/libs/ui-lib/lib/common/validationSchemas/addressValidation.tsx b/libs/ui-lib/lib/common/validationSchemas/addressValidation.tsx
index 374ee4d505..a8b1467a2c 100644
--- a/libs/ui-lib/lib/common/validationSchemas/addressValidation.tsx
+++ b/libs/ui-lib/lib/common/validationSchemas/addressValidation.tsx
@@ -29,7 +29,10 @@ export const ipNoSuffixValidationSchema = (t: TFunction) =>
 
 export const macAddressValidationSchema = (t: TFunction) =>
   Yup.string().matches(MAC_REGEX, {
-    message: (value) => t('ai:Value "{{value}}" is not valid MAC address.', { value }),
+    message: (params: { value?: unknown }) =>
+      t('ai:Value "{{value}}" is not valid MAC address.', {
+        value: params?.value !== undefined ? String(params.value) : '',
+      }),
     excludeEmptyString: true,
   });
 
diff --git a/libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx b/libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx
index ad5cb633cb..41ae0aa2b9 100644
--- a/libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx
+++ b/libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx
@@ -92,11 +92,17 @@ export const getIpAddressValidationSchema = (protocolVersion: ProtocolVersion) =
   const protocolVersionLabel = protocolVersion === ProtocolVersion.ipv4 ? 'IPv4' : 'IPv6';
   return Yup.string().test(
     protocolVersion,
-    `Value \${value} is not a valid ${protocolVersionLabel} address`,
+    (params: { value?: unknown }) =>
+      `Value "${
+        params?.value !== undefined ? String(params.value) : ''
+      }" is not a valid ${protocolVersionLabel} address`,
     (value?: string) => {
-      if (!value) {
+      if (value === undefined || value === '') {
         return true;
       }
+      if (typeof value !== 'string') {
+        return false;
+      }
       return isValidAddress(value, protocolVersion);
     },
   );
diff --git a/libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.tsx b/libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.tsx
index ae9ad14184..5c910d0a79 100644
--- a/libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.tsx
+++ b/libs/ui-lib/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.tsx
@@ -96,6 +96,7 @@ const getExpandedHostComponent = (protocolType: StaticProtocolType) => {
               label={`IP address (${getProtocolVersionLabel(protocolVersion)})`}
               fieldId={getFieldId(`${fieldName}.ips.${protocolVersion}`, 'input')}
               key={protocolVersion}
+              isRequired
             >
               <OcmInputField
                 name={`${fieldName}.ips.${protocolVersion}`}