diff --git a/charts/argo-cd/templates/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml
index 467ec61f..292bf94b 100644
--- a/charts/argo-cd/templates/argocd-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-server/service.yaml
@@ -32,10 +32,12 @@ spec:
   selector:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-{{- if .Values.controller.service.loadBalancerIP }}
+{{- if eq .Values.server.service.type "LoadBalancer" }}
+{{- if .Values.server.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.server.service.loadBalancerIP | quote }}
 {{- end }}
-{{- if and (eq .Values.server.service.type "LoadBalancer") .Values.server.service.loadBalancerSourceRanges }}
+{{- if .Values.server.service.loadBalancerSourceRanges }}
   loadBalancerSourceranges:
 {{ toYaml .Values.server.service.loadBalancerSourceRanges | indent 4 }}
+{{- end }}
 {{- end -}}