diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 34703fec58..0edbe3be08 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -153,7 +153,7 @@ AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
 DATABASES = AUTH_TOKENS['DATABASES']
 MODULESTORE = AUTH_TOKENS['MODULESTORE']
 CONTENTSTORE = AUTH_TOKENS['CONTENTSTORE']
-DOC_STORE_CONFIG = MODULESTORE['default']['OPTIONS']['stores']['default']['DOC_STORE_CONFIG']
+DOC_STORE_CONFIG = AUTH_TOKENS.get('DOC_STORE_CONFIG',DOC_STORE_CONFIG)
 # Datadog for events!
 DATADOG = AUTH_TOKENS.get("DATADOG", {})
 DATADOG.update(ENV_TOKENS.get("DATADOG", {}))
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 3f12afa726..dfe274fc62 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -236,7 +236,7 @@ XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE']
 # use the one from common.py
 MODULESTORE = AUTH_TOKENS.get('MODULESTORE', MODULESTORE)
 CONTENTSTORE = AUTH_TOKENS.get('CONTENTSTORE', CONTENTSTORE)
-DOC_STORE_CONFIG = MODULESTORE['default']['OPTIONS']['stores']['default']['DOC_STORE_CONFIG']
+DOC_STORE_CONFIG = AUTH_TOKENS.get('DOC_STORE_CONFIG',DOC_STORE_CONFIG)
 
 OPEN_ENDED_GRADING_INTERFACE = AUTH_TOKENS.get('OPEN_ENDED_GRADING_INTERFACE',
                                                OPEN_ENDED_GRADING_INTERFACE)