diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/AIEndpointAuth.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/AIEndpointAuth.jsx
index d59a893d6b6..228fdf4ff4f 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/AIEndpointAuth.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/AIEndpointAuth.jsx
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 
 import { isRestricted } from 'AppData/AuthManager';
@@ -33,11 +33,22 @@ export default function AIEndpointAuth(props) {
     const [apiKeyIdentifier] = useState(apiKeyParamConfig.authHeader || apiKeyParamConfig.authQueryParam);
 
     const [apiKeyValue, setApiKeyValue] =
-        useState(api.endpointConfig?.endpoint_security?.[isProduction ? 'production' : 'sandbox']?.apiKeyValue ?
-            '***********' : null);
+        useState(api.endpointConfig?.endpoint_security?.[isProduction ? 'production' : 'sandbox']?.apiKeyValue === '' ?
+            '********' : null);
 
     const [isHeaderParameter] = useState(!!apiKeyParamConfig.authHeader);
 
+    useEffect(() => {
+        saveEndpointSecurityConfig({
+            ...CONSTS.DEFAULT_ENDPOINT_SECURITY,
+            type: 'apikey',
+            apiKeyIdentifier,
+            apiKeyValue: api.endpointConfig?.endpoint_security?.[isProduction ? 'production' : 'sandbox']?.apiKeyValue
+                === '' ? '' : null,
+            enabled: true,
+        }, isProduction ? 'production' : 'sandbox');
+    }, []);
+
     return (
         <>
             <TextField
@@ -76,7 +87,7 @@ export default function AIEndpointAuth(props) {
                         ...CONSTS.DEFAULT_ENDPOINT_SECURITY,
                         type: 'apikey',
                         apiKeyIdentifier,
-                        apiKeyValue: event.target.value,
+                        apiKeyValue: event.target.value === '********' ? '' : event.target.value,
                         enabled: true,
                     }, isProduction ? 'production' : 'sandbox');
                 }}
diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/Endpoints.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/Endpoints.jsx
index 4f90149b868..7379d4269aa 100644
--- a/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/Endpoints.jsx
+++ b/portals/publisher/src/main/webapp/source/src/app/components/Apis/Details/Endpoints/Endpoints.jsx
@@ -343,7 +343,7 @@ function Endpoints(props) {
                         }
                     }
                 } else if (production.type === 'apikey') {
-                    if (!production.apiKeyValue || !production.apiKeyValue) {
+                    if (production.apiKeyValue === null) {
                         return {
                             isValid: false,
                             message: intl.formatMessage({
@@ -397,7 +397,7 @@ function Endpoints(props) {
                         }
                     }
                 } else if (sandbox.type === 'apikey') {
-                    if (!sandbox.apiKeyValue|| !sandbox.apiKeyValue) {
+                    if (sandbox.apiKeyValue === null) {
                         return {
                             isValid: false,
                             message: intl.formatMessage({
@@ -416,6 +416,14 @@ function Endpoints(props) {
                     };
                 }
             }
+        } else if ((!endpointConfig || !endpointConfig.endpoint_security) && apiObject.aiConfiguration) {
+            return {
+                isValid: false,
+                message: intl.formatMessage({
+                    id: 'Apis.Details.Endpoints.Endpoints.missing.endpoint.error',
+                    defaultMessage: 'Production & Sandbox Endpoint Security should be added',
+                }),
+            };
         }
         if (endpointConfig === null) {
             return { isValid: true, message: '' };