diff --git a/deploy/charts/admin/templates/admin/admin-ns.yaml b/deploy/charts/admin/templates/admin/admin-ns.yaml
new file mode 100644
index 00000000..cfe6d0a3
--- /dev/null
+++ b/deploy/charts/admin/templates/admin/admin-ns.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ template "admin.namespace" . }}
+  labels:
+  {{- include "admin.labels" . | nindent 4 }}
+
+
diff --git a/deploy/charts/admin/templates/custom/_namespaces.tpl b/deploy/charts/admin/templates/custom/_namespaces.tpl
index 66c1dea5..db10b5ea 100644
--- a/deploy/charts/admin/templates/custom/_namespaces.tpl
+++ b/deploy/charts/admin/templates/custom/_namespaces.tpl
@@ -4,8 +4,8 @@ Return Admin Namespace to use.
 {{- define "admin.namespace" -}}
 {{- if .Values.namespaceOverride }}
 {{- .Values.namespaceOverride }}
-{{- else -}}
-{{- .Release.Namespace }}
+{{- else if not (empty .Release.Namespace) -}}
+{{- "dubbo-system" | default }}
 {{- end }}
 {{- end }}