diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66bcf699f2..f02efbb1b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Note: Breaking changes between versions are indicated by "💥".
 
+## Unreleased
+
+- [Bugfix] Share grade download settings between the LMS and the CMS
+
 ## v10.0.8 (2020-06-23)
 
 - [Bugfix] Fix android user creation during init
diff --git a/tutor/templates/apps/openedx/settings/partials/common_all.py b/tutor/templates/apps/openedx/settings/partials/common_all.py
index 87dd1cda77..350c7c32a5 100644
--- a/tutor/templates/apps/openedx/settings/partials/common_all.py
+++ b/tutor/templates/apps/openedx/settings/partials/common_all.py
@@ -34,6 +34,14 @@
 VIDEO_IMAGE_SETTINGS["STORAGE_KWARGS"]["location"] = MEDIA_ROOT
 VIDEO_TRANSCRIPTS_SETTINGS["STORAGE_KWARGS"]["location"] = MEDIA_ROOT
 
+GRADES_DOWNLOAD = {
+    "STORAGE_TYPE": "",
+    "STORAGE_KWARGS": {
+        "base_url": "/media/grades/",
+        "location": "/openedx/media/grades",
+    },
+}
+
 ORA2_FILEUPLOAD_BACKEND = "filesystem"
 ORA2_FILEUPLOAD_ROOT = "/openedx/data/ora2"
 ORA2_FILEUPLOAD_CACHE_NAME = "ora2-storage"
diff --git a/tutor/templates/apps/openedx/settings/partials/common_lms.py b/tutor/templates/apps/openedx/settings/partials/common_lms.py
index bad1f5f18e..5eb709d489 100644
--- a/tutor/templates/apps/openedx/settings/partials/common_lms.py
+++ b/tutor/templates/apps/openedx/settings/partials/common_lms.py
@@ -11,14 +11,6 @@
     MEDIA_ROOT, "profile-images/"
 )
 
-GRADES_DOWNLOAD = {
-    "STORAGE_TYPE": "",
-    "STORAGE_KWARGS": {
-        "base_url": "/media/grades/",
-        "location": "/openedx/media/grades",
-    },
-}
-
 COURSE_CATALOG_VISIBILITY_PERMISSION = "see_in_catalog"
 COURSE_ABOUT_VISIBILITY_PERMISSION = "see_about_page"