diff --git a/stable/mongodb-replicaset/Chart.yaml b/stable/mongodb-replicaset/Chart.yaml
index e55b1898e0..d61ac7af8a 100644
--- a/stable/mongodb-replicaset/Chart.yaml
+++ b/stable/mongodb-replicaset/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: mongodb-replicaset
 home: https://github.com/mongodb/mongo
-version: 3.16.1
+version: 3.16.2
 appVersion: 3.6
 description: NoSQL document-oriented database that stores JSON-like documents with
   dynamic schemas, simplifying the integration of data in content-driven applications.
diff --git a/stable/mongodb-replicaset/README.md b/stable/mongodb-replicaset/README.md
index 192d095e17..4be9a34632 100644
--- a/stable/mongodb-replicaset/README.md
+++ b/stable/mongodb-replicaset/README.md
@@ -112,6 +112,7 @@ The following table lists the configurable parameters of the mongodb chart and t
 | `extraVars`                         | Set environment variables for the main container                          | `{}`                                                |
 | `extraLabels`                       | Additional labels to add to resources                                     | `{}`                                                |
 | `extraVolumes`                      | Additional volumes to add to the resources                                | `[]`                                                |
+| `clientService.enabled`             | Enables the headless client service                                       | `true`                                              |
 | `global.namespaceOverride`          | Override the deployment namespace                                         | Not set (`Release.Namespace`)                       |
 
 *MongoDB config file*
diff --git a/stable/mongodb-replicaset/templates/mongodb-service-client.yaml b/stable/mongodb-replicaset/templates/mongodb-service-client.yaml
index af1dfdde85..c0aab05ca6 100644
--- a/stable/mongodb-replicaset/templates/mongodb-service-client.yaml
+++ b/stable/mongodb-replicaset/templates/mongodb-service-client.yaml
@@ -1,4 +1,5 @@
-# A headless service for client applications to use
+{{- if .Values.clientService.enabled -}}
+# An optional headless service for client applications to use
 apiVersion: v1
 kind: Service
 metadata:
@@ -30,4 +31,4 @@ spec:
   selector:
     app: {{ template "mongodb-replicaset.name" . }}
     release: {{ .Release.Name }}
-
+{{- end -}}
diff --git a/stable/mongodb-replicaset/values.yaml b/stable/mongodb-replicaset/values.yaml
index b80f4d6de2..87e267b378 100644
--- a/stable/mongodb-replicaset/values.yaml
+++ b/stable/mongodb-replicaset/values.yaml
@@ -3,8 +3,9 @@ nameOverride: ""
 fullnameOverride: ""
 
 # Override the deployment namespace
-global:
-#  namespaceOverride: ""
+global: {}
+# global:
+#   namespaceOverride: ""
 
 replicas: 3
 port: 27017
@@ -198,3 +199,7 @@ livenessProbe:
   failureThreshold: 3
   periodSeconds: 10
   successThreshold: 1
+
+# Enables/disables the headless client service
+clientService:
+  enabled: true