diff --git a/src/video_display/decklink.cpp b/src/video_display/decklink.cpp
index fe4c83e05..ae1e05fec 100644
--- a/src/video_display/decklink.cpp
+++ b/src/video_display/decklink.cpp
@@ -845,7 +845,7 @@ static void *display_decklink_init(struct module *parent, const char *fmt, unsig
         BMDAudioOutputAnalogAESSwitch audioConnection = (BMDAudioOutputAnalogAESSwitch) 0;
         BMDVideo3DPackingFormat HDMI3DPacking = (BMDVideo3DPackingFormat) 0;
         int audio_consumer_levels = -1;
-        BMDVideoOutputConversionMode conversion_mode = bmdNoVideoOutputConversion;
+        BMDVideoOutputConversionMode conversion_mode = 0;
         bool use1080p_not_psf = true;
 
         if (!blackmagic_api_version_check()) {
@@ -1090,11 +1090,13 @@ static void *display_decklink_init(struct module *parent, const char *fmt, unsig
                         goto error;
                 }
 
-		result = deckLinkConfiguration->SetInt(bmdDeckLinkConfigVideoOutputConversionMode, conversion_mode);
-		if (result != S_OK) {
-			log_msg(LOG_LEVEL_ERROR, "Unable to set conversion mode.\n");
-			goto error;
-		}
+                if (conversion_mode != 0) {
+                        result = deckLinkConfiguration->SetInt(bmdDeckLinkConfigVideoOutputConversionMode, conversion_mode);
+                        if (result != S_OK) {
+                                log_msg(LOG_LEVEL_ERROR, "Unable to set conversion mode.\n");
+                                goto error;
+                        }
+                }
 
 		result = deckLinkConfiguration->SetFlag(bmdDeckLinkConfigUse1080pNotPsF, use1080p_not_psf);
 		if (result != S_OK) {