diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 20ec62e70a..358c8e201c 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -297,8 +297,7 @@ def edit_unit(request, location):
     # Check if there are any advanced modules specified in the course policy. These modules
     # should be specified as a list of strings, where the strings are the names of the modules
     # in ADVANCED_COMPONENT_TYPES that should be enabled for the course.
-    course_metadata = CourseMetadata.fetch(course.location)
-    course_advanced_keys = course_metadata.get(ADVANCED_COMPONENT_POLICY_KEY, [])
+    course_advanced_keys = course.advanced_modules
 
     # Set component types according to course policy file
     component_types = list(COMPONENT_TYPES)
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index fdcc2848ea..21864b8680 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -178,6 +178,7 @@ class CourseDescriptor(SequenceDescriptor):
     remote_gradebook = Object(scope=Scope.settings, default={})
     allow_anonymous = Boolean(scope=Scope.settings, default=True)
     allow_anonymous_to_peers = Boolean(scope=Scope.settings, default=False)
+    advanced_modules = List(help="Beta modules used in your course", default=[], scope=Scope.settings)
     has_children = True
 
     info_sidebar_name = String(scope=Scope.settings, default='Course Handouts')