diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9282dd0c4..d2862b7ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 Features:
 * server: Add `extraLabels` for Vault server serviceAccount [GH-806](https://github.com/hashicorp/vault-helm/pull/806)
 
+Bugs:
+* server: Quote `.server.ha.clusterAddr` value [GH-810](https://github.com/hashicorp/vault-helm/pull/810)
+
 ## 0.22.1 (October 26th, 2022)
 
 Changes:
diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml
index fb3cbfab7..8d556e827 100644
--- a/templates/server-statefulset.yaml
+++ b/templates/server-statefulset.yaml
@@ -106,7 +106,7 @@ spec:
                   fieldPath: metadata.name
             - name: VAULT_CLUSTER_ADDR
               {{- if .Values.server.ha.clusterAddr }}
-              value: {{ .Values.server.ha.clusterAddr }}
+              value: {{ .Values.server.ha.clusterAddr | quote }}
               {{- else }}
               value: "https://$(HOSTNAME).{{ template "vault.fullname" . }}-internal:8201"
               {{- end }}
diff --git a/test/unit/server-ha-statefulset.bats b/test/unit/server-ha-statefulset.bats
index 342fa433d..06a0ca0a0 100755
--- a/test/unit/server-ha-statefulset.bats
+++ b/test/unit/server-ha-statefulset.bats
@@ -476,6 +476,22 @@ load _helpers
   [ "${value}" = 'http://$(HOSTNAME).release-name-vault-internal:8201' ]
 }
 
+@test "server/ha-StatefulSet: clusterAddr gets quoted" {
+  cd `chart_dir`
+  local customUrl='http://$(HOSTNAME).release-name-vault-internal:8201'
+  local rendered=$(helm template \
+      --show-only templates/server-statefulset.yaml  \
+      --set 'server.ha.enabled=true' \
+      --set 'server.ha.raft.enabled=true' \
+      --set "server.ha.clusterAddr=${customUrl}" \
+      . | tee /dev/stderr | \
+      grep -F "${customUrl}" | tee /dev/stderr)
+
+local value=$(echo $rendered |
+      yq -Y '.' | tee /dev/stderr)
+  [ "${value}" = 'value: "http://$(HOSTNAME).release-name-vault-internal:8201"' ]
+}
+
 #--------------------------------------------------------------------
 # VAULT_RAFT_NODE_ID renders