diff --git a/stable/postgresql/Chart.yaml b/stable/postgresql/Chart.yaml
index 96291f0b9a..242087fe55 100644
--- a/stable/postgresql/Chart.yaml
+++ b/stable/postgresql/Chart.yaml
@@ -1,5 +1,5 @@
 name: postgresql
-version: 2.7.9
+version: 2.7.10
 appVersion: 10.6.0
 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
 keywords:
diff --git a/stable/postgresql/templates/statefulset.yaml b/stable/postgresql/templates/statefulset.yaml
index ed3abbe741..321dc8ced7 100644
--- a/stable/postgresql/templates/statefulset.yaml
+++ b/stable/postgresql/templates/statefulset.yaml
@@ -110,8 +110,10 @@ spec:
               name: {{ template "postgresql.fullname" . }}
             {{- end }}  
               key: postgresql-password
+        {{- if .Values.postgresqlDatabase }}
         - name: POSTGRESQL_DATABASE
           value: {{ .Values.postgresqlDatabase | quote }}
+        {{- end }}
         - name: POD_IP
           valueFrom: { fieldRef: { fieldPath: status.podIP } }
 {{- if .Values.extraEnv }}