diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 429d1cf4df..514b89d419 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -291,9 +291,14 @@ def get_component_templates(courselike, library=False):
             # add the default template with localized display name
             # TODO: Once mixins are defined per-application, rather than per-runtime,
             # this should use a cms mixed-in class. (cpennington)
+            template_id = None
             display_name = xblock_type_display_name(category, _('Blank'))  # this is the Blank Advanced problem
+            # The first template that is given should be Blank Assessment Template
+            if category == 'openassessment':
+                display_name = _("Blank Open Response Assessment")
+                template_id = "blank-assessment"
             templates_for_category.append(
-                create_template_dict(display_name, category, support_level_without_template, None, 'advanced')
+                create_template_dict(display_name, category, support_level_without_template, template_id, 'advanced')
             )
             categories.add(category)
 
diff --git a/cms/djangoapps/contentstore/views/tests/test_item.py b/cms/djangoapps/contentstore/views/tests/test_item.py
index 3e74398d61..f5d3f51c2e 100644
--- a/cms/djangoapps/contentstore/views/tests/test_item.py
+++ b/cms/djangoapps/contentstore/views/tests/test_item.py
@@ -2296,7 +2296,7 @@ class TestComponentTemplates(CourseTestCase):
         """
         self._verify_basic_component("discussion", "Discussion")
         self._verify_basic_component("video", "Video")
-        self._verify_basic_component("openassessment", "Open Response Assessment")
+        self._verify_basic_component("openassessment", "Blank Open Response Assessment")
         self._verify_basic_component_display_name("discussion", "Discussion")
         self._verify_basic_component_display_name("video", "Video")
         self._verify_basic_component_display_name("openassessment", "Open Response")