diff --git a/configuration.c b/configuration.c
index 41cdc6b786..7a6b75fe39 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1567,7 +1567,7 @@ static bool config_load_file(const char *path, bool set_defaults)
    if (config_get_bool(conf, "custom_bgm_enable", &tmp_bool))
       global->console.sound.system_bgm_enable = tmp_bool;
 #endif
-   if (!global->has_set.verbosity)
+   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_VERBOSITY))
    {
       if (config_get_bool(conf, "log_verbosity", &tmp_bool))
       {
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 09fabaeaab..28289b1537 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -61,6 +61,7 @@
 #include "../config.def.h"
 #include "../performance_counters.h"
 #include "../lakka.h"
+#include "../retroarch.h"
 
 #include "../tasks/tasks_internal.h"
 
@@ -3464,7 +3465,10 @@ void general_write_handler(void *data)
             else
                verbosity_disable();
 
-            global->has_set.verbosity = *setting->value.target.boolean;
+            if (*setting->value.target.boolean)
+               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY);
+            else
+               retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_VERBOSITY);
          }
          break;
       case MENU_ENUM_LABEL_VIDEO_SMOOTH:
diff --git a/retroarch.c b/retroarch.c
index c8cb4e4e5c..eb1b73017e 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -711,7 +711,6 @@ static void retroarch_parse_input(int argc, char *argv[])
    global->has_set.save_path             = false;
    global->has_set.state_path            = false;
    global->has_set.libretro_directory    = false;
-   global->has_set.verbosity             = false;
 
    global->has_set.netplay_mode          = false;
 
@@ -819,10 +818,8 @@ static void retroarch_parse_input(int argc, char *argv[])
             break;
 
          case 'v':
-            {
-               verbosity_enable();
-               global->has_set.verbosity = true;
-            }
+            verbosity_enable();
+            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY);
             break;
 
          case 'N':
@@ -1626,12 +1623,15 @@ void retroarch_fill_pathnames(void)
             sizeof(global->name.ips));
 }
 
-static bool has_set_libretro = false;
+static bool has_set_verbosity = false;
+static bool has_set_libretro  = false;
 
 bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx)
 {
    switch (enum_idx)
    {
+      case RARCH_OVERRIDE_SETTING_VERBOSITY:
+         return has_set_verbosity;
       case RARCH_OVERRIDE_SETTING_LIBRETRO:
          return has_set_libretro;
       case RARCH_OVERRIDE_SETTING_NONE:
@@ -1646,6 +1646,9 @@ void retroarch_override_setting_set(enum rarch_override_setting enum_idx)
 {
    switch (enum_idx)
    {
+      case RARCH_OVERRIDE_SETTING_VERBOSITY:
+         has_set_verbosity = true;
+         break;
       case RARCH_OVERRIDE_SETTING_LIBRETRO:
          has_set_libretro = true;
          break;
@@ -1659,6 +1662,9 @@ void retroarch_override_setting_unset(enum rarch_override_setting enum_idx)
 {
    switch (enum_idx)
    {
+      case RARCH_OVERRIDE_SETTING_VERBOSITY:
+         has_set_verbosity = false;
+         break;
       case RARCH_OVERRIDE_SETTING_LIBRETRO:
          has_set_libretro = false;
          break;
diff --git a/retroarch.h b/retroarch.h
index 3c18365f3e..322844357a 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -102,6 +102,7 @@ enum rarch_override_setting
 {
    RARCH_OVERRIDE_SETTING_NONE = 0,
    RARCH_OVERRIDE_SETTING_LIBRETRO,
+   RARCH_OVERRIDE_SETTING_VERBOSITY,
    RARCH_OVERRIDE_SETTING_LAST
 };
 
diff --git a/runloop.h b/runloop.h
index 3c5a92f945..3925f91d9e 100644
--- a/runloop.h
+++ b/runloop.h
@@ -181,7 +181,6 @@ typedef struct global
    {
       bool save_path;
       bool state_path;
-      bool verbosity;
 
       bool libretro_device[MAX_USERS];
       bool libretro_directory;
diff --git a/tasks/task_content.c b/tasks/task_content.c
index baacb204ad..26157d7c42 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1554,7 +1554,7 @@ static void menu_content_environment_get(int *argc, char *argv[],
    wrap_args->no_content       = menu_driver_ctl(
          RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL);
 
-   if (!global->has_set.verbosity)
+   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_VERBOSITY))
       wrap_args->verbose       = verbosity_is_enabled();
 
    wrap_args->touched          = true;