diff --git a/charts/argo-workflows/templates/controller/workflow-sa.yaml b/charts/argo-workflows/templates/controller/workflow-sa.yaml
index 12c6ae3e..4bca33e0 100644
--- a/charts/argo-workflows/templates/controller/workflow-sa.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-sa.yaml
@@ -38,12 +38,11 @@ metadata:
 
   {{- else }}
 
-    {{- /*
-      The namespace will default to "argo" if neither "namespaces" nor "namespace" is set
-    */}}
     {{ include "sa-base" . }}
   name: {{ $.Values.workflow.serviceAccount.name }}
-  namespace: {{ .Values.workflow.namespace | default "argo" }}
+    {{- if .Values.workflow.namespace }}
+  namespace: {{ .Values.workflow.namespace }}
+    {{- end }}
   annotations:
     {{- toYaml $.Values.workflow.serviceAccount.annotations | nindent 4 }}
   {{- end }}