diff --git a/configuration.c b/configuration.c
index 81a3b75b91..06a0e3092b 100644
--- a/configuration.c
+++ b/configuration.c
@@ -483,6 +483,8 @@ static void config_set_defaults(void)
    settings->video.threaded              = video_threaded;
    settings->bundle_assets_extract_enable = bundle_assets_extract_enable;
 
+   if (g_defaults.settings.video_threaded_enable != video_threaded)
+      settings->video.threaded           = g_defaults.settings.video_threaded_enable;
 
 #ifdef HAVE_THREADS
    settings->threaded_data_runloop_enable = threaded_data_runloop_enable;
@@ -747,9 +749,6 @@ static void config_set_defaults(void)
    global->console.sound.mode = SOUND_MODE_NORMAL;
 #endif
 
-   if (g_defaults.settings.video_threaded_enable)
-      settings->video.threaded           = g_defaults.settings.video_threaded_enable;
-
    if (*g_defaults.path.buildbot_server_url)
       strlcpy(settings->network.buildbot_url,
             g_defaults.path.buildbot_server_url, sizeof(settings->network.buildbot_url));