diff --git a/CHANGELOG.md b/CHANGELOG.md
index 089719d0bf5..1b9d4e681fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ Every user-facing change should have an entry in this changelog. Please respect
 -->
 
 ## Unreleased
+- [Bugfix] Fix MongoDB replica set connection error resulting from edx-platform's pymongo (3.10.1 -> 3.12.3) upgrade ([edx-platform#30569](https://github.com/openedx/edx-platform/pull/30569)). (by @ormsbee)
 - [Improvement] Make it possible to override k8s resources in plugins using `k8s-override` patch. (by @foadlind)
 
 ## v14.0.2 (2022-06-27)
diff --git a/tutor/templates/apps/openedx/config/partials/auth.yml b/tutor/templates/apps/openedx/config/partials/auth.yml
index 2ec64487076..3e72058013f 100644
--- a/tutor/templates/apps/openedx/config/partials/auth.yml
+++ b/tutor/templates/apps/openedx/config/partials/auth.yml
@@ -1,7 +1,6 @@
 SECRET_KEY: "{{ OPENEDX_SECRET_KEY }}"
 AWS_ACCESS_KEY_ID: "{{ OPENEDX_AWS_ACCESS_KEY }}"
 AWS_SECRET_ACCESS_KEY: "{{ OPENEDX_AWS_SECRET_ACCESS_KEY }}"
-CONTENTSTORE: null
 DOC_STORE_CONFIG: null
 {{ patch("openedx-auth") }}
 XQUEUE_INTERFACE:
diff --git a/tutor/templates/apps/openedx/settings/partials/common_all.py b/tutor/templates/apps/openedx/settings/partials/common_all.py
index d6a92914e73..8a74c88ea64 100644
--- a/tutor/templates/apps/openedx/settings/partials/common_all.py
+++ b/tutor/templates/apps/openedx/settings/partials/common_all.py
@@ -16,6 +16,7 @@
     "password": None,
     {% endif %}
     "db": "{{ MONGODB_DATABASE }}",
+    "replicaSet": None,
 }
 DOC_STORE_CONFIG = mongodb_parameters
 CONTENTSTORE = {