diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py
index 3a8265aef9..224895b574 100644
--- a/cms/djangoapps/models/settings/course_metadata.py
+++ b/cms/djangoapps/models/settings/course_metadata.py
@@ -60,6 +60,10 @@ class CourseMetadata(object):
         if not settings.FEATURES.get('ENABLE_EDXNOTES'):
             filtered_list.append('edxnotes')
 
+        # Do not show video_upload_pipeline if the feature is disabled.
+        if not settings.FEATURES.get('ENABLE_VIDEO_UPLOAD_PIPELINE'):
+            filtered_list.append('video_upload_pipeline')
+
         return filtered_list
 
     @classmethod
diff --git a/common/test/acceptance/pages/studio/settings_advanced.py b/common/test/acceptance/pages/studio/settings_advanced.py
index ccefeb58c2..34a615fab2 100644
--- a/common/test/acceptance/pages/studio/settings_advanced.py
+++ b/common/test/acceptance/pages/studio/settings_advanced.py
@@ -196,5 +196,4 @@ class AdvancedSettingsPage(CoursePage):
             'static_asset_path',
             'text_customization',
             'annotation_storage_url',
-            'video_upload_pipeline'
         ]