diff --git a/scripts/addons_core/node_wrangler/operators.py b/scripts/addons_core/node_wrangler/operators.py
index 69333e90b8d..a5e1527e984 100644
--- a/scripts/addons_core/node_wrangler/operators.py
+++ b/scripts/addons_core/node_wrangler/operators.py
@@ -2222,15 +2222,19 @@ class NWSaveViewer(bpy.types.Operator, ExportHelper):
                 '.tiff': 'TIFF',
                 '.tif': 'TIFF'}
             basename, ext = path.splitext(fp)
-            old_render_format = context.scene.render.image_settings.file_format
+            image_settings = context.scene.render.image_settings
+            old_media_type = image_settings.media_type
+            old_file_format = image_settings.file_format
             old_tree_type = context.space_data.tree_type
-            context.scene.render.image_settings.file_format = formats[self.filename_ext]
+            image_settings.media_type = 'IMAGE'
+            image_settings.file_format = formats[self.filename_ext]
             context.area.type = "IMAGE_EDITOR"
             context.area.spaces[0].image = bpy.data.images['Viewer Node']
             context.area.spaces[0].image.save_render(fp)
             context.area.type = "NODE_EDITOR"
             context.space_data.tree_type = old_tree_type
-            context.scene.render.image_settings.file_format = old_render_format
+            image_settings.media_type = old_media_type
+            image_settings.file_format = old_file_format
             return {'FINISHED'}
 
 
diff --git a/scripts/modules/bl_previews_utils/bl_previews_render.py b/scripts/modules/bl_previews_utils/bl_previews_render.py
index 671dfafbc29..2fd686b15cc 100644
--- a/scripts/modules/bl_previews_utils/bl_previews_render.py
+++ b/scripts/modules/bl_previews_utils/bl_previews_render.py
@@ -112,6 +112,7 @@ def do_previews(do_objects, do_collections, do_scenes, do_data_intern):
             scene.render.film_transparent = True
             # TODO: define Cycles world?
 
+        scene.render.image_settings.media_type = 'IMAGE'
         scene.render.image_settings.file_format = 'PNG'
         scene.render.image_settings.color_depth = '8'
         scene.render.image_settings.color_mode = 'RGBA'
diff --git a/scripts/startup/bl_app_templates_system/Video_Editing/__init__.py b/scripts/startup/bl_app_templates_system/Video_Editing/__init__.py
index b21e7a247c0..15c9c96b0c8 100644
--- a/scripts/startup/bl_app_templates_system/Video_Editing/__init__.py
+++ b/scripts/startup/bl_app_templates_system/Video_Editing/__init__.py
@@ -25,6 +25,7 @@ def update_factory_startup_ffmpeg_preset():
 
     for scene in bpy.data.scenes:
         render = scene.render
+        render.image_settings.media_type = 'VIDEO'
         render.image_settings.file_format = 'FFMPEG'
 
         if preset_filepath:
diff --git a/tests/files/auto/test_utils.py b/tests/files/auto/test_utils.py
index 792f042e880..fb6d415bb07 100644
--- a/tests/files/auto/test_utils.py
+++ b/tests/files/auto/test_utils.py
@@ -56,6 +56,7 @@ def render(shading_system):
         set_shading_system(scene, shading_system)
         scene.render.filepath = "%s/test_renders/%s_%s" % (test_dir, filename, shading_system)
 
+    scene.render.image_settings.media_type = 'IMAGE'
     scene.render.image_settings.file_format = 'PNG'
     scene.render.use_file_extension = True
 
diff --git a/tests/performance/tests/cycles.py b/tests/performance/tests/cycles.py
index f4da661e3dd..22ee4631c5e 100644
--- a/tests/performance/tests/cycles.py
+++ b/tests/performance/tests/cycles.py
@@ -24,6 +24,7 @@ def _run(args):
     scene = bpy.context.scene
     scene.render.engine = 'CYCLES'
     scene.render.filepath = args['render_filepath']
+    scene.render.image_settings.media_type = 'IMAGE'
     scene.render.image_settings.file_format = 'PNG'
     scene.cycles.device = 'CPU' if device_type == 'CPU' else 'GPU'
 
diff --git a/tests/python/bl_imbuf_load.py b/tests/python/bl_imbuf_load.py
index 9a7aa6b15eb..0f5a0d93b34 100644
--- a/tests/python/bl_imbuf_load.py
+++ b/tests/python/bl_imbuf_load.py
@@ -73,6 +73,7 @@ class ImBufTest(AbstractImBufTest):
     def _save_exr(self, img, out_exr_path):
         scene = bpy.data.scenes[0]
         image_settings = scene.render.image_settings
+        image_settings.media_type = 'IMAGE'
         image_settings.file_format = "OPEN_EXR"
         image_settings.color_mode = "RGBA"
         image_settings.color_depth = "32"
diff --git a/tests/python/bl_mesh_modifiers.py b/tests/python/bl_mesh_modifiers.py
index f2d115a2888..70c4f9523d3 100644
--- a/tests/python/bl_mesh_modifiers.py
+++ b/tests/python/bl_mesh_modifiers.py
@@ -33,6 +33,7 @@ def render_gl(context, filepath, shade):
     scene = context.scene
     render = scene.render
     render.filepath = filepath
+    render.image_settings.media_type = 'IMAGE'
     render.image_settings.file_format = 'PNG'
     render.image_settings.color_mode = 'RGB'
     render.use_file_extension = True
diff --git a/tools/utils_doc/code_layout_diagram.py b/tools/utils_doc/code_layout_diagram.py
index 8073b9f7277..73c01229f0e 100644
--- a/tools/utils_doc/code_layout_diagram.py
+++ b/tools/utils_doc/code_layout_diagram.py
@@ -953,6 +953,7 @@ def render_output(scene, bounds, filepath):
     scene.collection.objects.link(camera)
 
     render = scene.render
+    render.image_settings.media_type = 'IMAGE'
     render.image_settings.file_format = 'JPEG'
     render.image_settings.color_depth = '8'
     render.image_settings.color_mode = 'RGB'