diff --git a/src/pages/projects/components/Modals/CreateApp/index.jsx b/src/pages/projects/components/Modals/CreateApp/index.jsx
index cd819715c79..99105e4ad3f 100644
--- a/src/pages/projects/components/Modals/CreateApp/index.jsx
+++ b/src/pages/projects/components/Modals/CreateApp/index.jsx
@@ -201,7 +201,7 @@ export default class ServiceDeployAppModal extends React.Component {
     }
 
     const dataList = await getProjectGateway()
-    const gateway = dataList[1] || dataList[0]
+    const gateway = dataList[1] || dataList[0] || {}
     const isGovernance = !!(this.serviceMeshEnable && gateway.serviceMeshEnable)
 
     set(
diff --git a/src/pages/projects/components/Modals/GatewaySetting/index.jsx b/src/pages/projects/components/Modals/GatewaySetting/index.jsx
index e2770d40979..f0951ed3982 100644
--- a/src/pages/projects/components/Modals/GatewaySetting/index.jsx
+++ b/src/pages/projects/components/Modals/GatewaySetting/index.jsx
@@ -108,6 +108,9 @@ export default class GatewaySettingModal extends React.Component {
         globals.config.loadBalancerDefaultAnnotations
       )
     }
+    if (annotationType) {
+      this.options = Object.keys(CLUSTER_PROVIDERS_ANNOTATIONS[annotationType])
+    }
   }
 
   handleOk = () => {
diff --git a/src/pages/projects/components/Modals/ServiceGatewaySetting/index.jsx b/src/pages/projects/components/Modals/ServiceGatewaySetting/index.jsx
index 180f3044699..6bbf15e5324 100644
--- a/src/pages/projects/components/Modals/ServiceGatewaySetting/index.jsx
+++ b/src/pages/projects/components/Modals/ServiceGatewaySetting/index.jsx
@@ -152,7 +152,7 @@ export default class GatewaySettingModal extends React.Component {
                 <Form.Item label={t('ANNOTATION_PL')}>
                   <PropertiesInput
                     name="metadata.annotations"
-                    hiddenKeys={globals.config.preservedAnnotations}
+                    hiddenKeys={[/^kubesphere.io\//, 'openpitrix_runtime']}
                     addText={t('ADD')}
                   />
                 </Form.Item>