diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 6767467e20f4..f4dcd66d9a7f 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -279,7 +279,14 @@ def create_support_legend_dict():
     component_types = COMPONENT_TYPES[:]
 
     # Libraries do not support discussions, drag-and-drop, and openassessment and other libraries
-    component_not_supported_by_library = ['discussion', 'library', 'openassessment', 'drag-and-drop-v2']
+    component_not_supported_by_library = [
+        'discussion',
+        'library',
+        'openassessment',
+        'drag-and-drop-v2',
+        'library_v2',
+        'itembank',
+    ]
     if library:
         component_types = [component for component in component_types
                            if component not in set(component_not_supported_by_library)]
diff --git a/cms/djangoapps/contentstore/views/tests/test_library.py b/cms/djangoapps/contentstore/views/tests/test_library.py
index 8278cd0535bb..b6c5765c5108 100644
--- a/cms/djangoapps/contentstore/views/tests/test_library.py
+++ b/cms/djangoapps/contentstore/views/tests/test_library.py
@@ -403,6 +403,8 @@ def test_get_component_templates(self):
         self.assertNotIn('advanced', templates)
         self.assertNotIn('openassessment', templates)
         self.assertNotIn('library', templates)
+        self.assertNotIn('library_v2', templates)
+        self.assertNotIn('itembank', templates)
 
     def test_advanced_problem_types(self):
         """