diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
index 77cc1932f..2e1716c09 100644
--- a/charts/kong/CHANGELOG.md
+++ b/charts/kong/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Improvements
 
+* Only set `Service` `clusterIP` when `type` is `ClusterIP`
 * Bumped Kong version to 3.5.
   [#957](https://github.com/Kong/charts/pull/957)
 * Support for `affinity` configuration has been added to migration job templates.
diff --git a/charts/kong/templates/_helpers.tpl b/charts/kong/templates/_helpers.tpl
index bd2f83d5f..5d37a0e56 100644
--- a/charts/kong/templates/_helpers.tpl
+++ b/charts/kong/templates/_helpers.tpl
@@ -251,7 +251,7 @@ spec:
   {{- if .externalTrafficPolicy }}
   externalTrafficPolicy: {{ .externalTrafficPolicy }}
   {{- end }}
-  {{- if .clusterIP }}
+  {{- if (and (eq .type "ClusterIP") .clusterIP )}}
   clusterIP: {{ .clusterIP }}
   {{- end }}
   selector: