diff --git a/charts/kyuubi/templates/kyuubi-headless-service.yaml b/charts/kyuubi/templates/kyuubi-headless-service.yaml
index 4b75c0b2e1a..7eac7c1d022 100644
--- a/charts/kyuubi/templates/kyuubi-headless-service.yaml
+++ b/charts/kyuubi/templates/kyuubi-headless-service.yaml
@@ -26,10 +26,12 @@ spec:
   clusterIP: None
   ports:
     {{- range $name, $frontend := .Values.server }}
+    {{- if $frontend.enabled }}
     - name: {{ $name | kebabcase }}
       port: {{ tpl $frontend.service.port $ }}
       targetPort: {{ $frontend.port }}
     {{- end }}
+    {{- end }}
     {{- if and .Values.metrics.enabled (.Values.metrics.reporters | nospace | splitList "," | has "PROMETHEUS") }}
     - name: prometheus
       port: {{ .Values.metrics.prometheusPort }}