diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 72957f3621..654c1e6ba5 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -1961,7 +1961,7 @@ int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
 
    if (cbs->setting && !cbs->setting->get_string_representation)
    {
-      switch (setting_get_type(cbs->setting))
+      switch (cbs->setting->type)
       {
          case ST_BOOL:
             BIND_ACTION_GET_VALUE(cbs,
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index f0abe738a8..3489b505e1 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -323,7 +323,7 @@ static int action_left_shader_filter_default(unsigned type, const char *label,
    if (!setting)
       return menu_cbs_exit();
    return menu_action_handle_setting(setting,
-         setting_get_type(setting), MENU_ACTION_LEFT, wraparound);
+         setting->type, MENU_ACTION_LEFT, wraparound);
 }
 #endif
 
@@ -819,8 +819,9 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
    {
       const char *parent_group   = cbs->setting->parent_group;
 
-      if (string_is_equal(parent_group, msg_hash_to_str(MENU_ENUM_LABEL_MAIN_MENU))
-               && (setting_get_type(cbs->setting) == ST_GROUP))
+      if (string_is_equal(parent_group,
+               msg_hash_to_str(MENU_ENUM_LABEL_MAIN_MENU))
+               && (cbs->setting->type == ST_GROUP))
       {
          BIND_ACTION_LEFT(cbs, action_left_mainmenu);
          return 0;
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 81d72789b8..6650278313 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1924,7 +1924,7 @@ static int action_ok_file_load(const char *path,
    if (!string_is_empty(menu_label))
       setting = menu_setting_find(menu_label);
 
-   if (setting_get_type(setting) == ST_PATH)
+   if (setting->type == ST_PATH)
       return action_ok_set_path(path, label, type, idx, entry_idx);
 
    if (!string_is_empty(menu_path))
@@ -5446,7 +5446,7 @@ static int generic_action_ok_dropdown_setting(const char *path, const char *labe
    if (!setting)
       return -1;
 
-   switch (setting_get_type(setting))
+   switch (setting->type)
    {
       case ST_INT:
          *setting->value.target.integer = (int32_t)(idx + setting->offset_by);
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 9e8871076d..80a09d1a5c 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -342,7 +342,7 @@ static int action_right_shader_filter_default(unsigned type, const char *label,
    if (!setting)
       return menu_cbs_exit();
    return menu_action_handle_setting(setting,
-         setting_get_type(setting), MENU_ACTION_RIGHT,
+         setting->type, MENU_ACTION_RIGHT,
          wraparound);
 }
 #endif
@@ -938,7 +938,7 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
       const char *parent_group   = cbs->setting->parent_group;
 
       if (string_is_equal(parent_group, msg_hash_to_str(MENU_ENUM_LABEL_MAIN_MENU))
-               && (setting_get_type(cbs->setting) == ST_GROUP))
+               && (cbs->setting->type == ST_GROUP))
       {
          BIND_ACTION_RIGHT(cbs, action_right_scroll);
          return 0;
diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c
index 8d539a9b03..e44defc580 100644
--- a/menu/cbs/menu_cbs_scan.c
+++ b/menu/cbs/menu_cbs_scan.c
@@ -225,7 +225,7 @@ int menu_cbs_init_bind_scan(menu_file_list_cbs_t *cbs,
 
    if (cbs->setting)
    {
-      if (setting_get_type(cbs->setting) == ST_BIND)
+      if (cbs->setting->type == ST_BIND)
       {
          BIND_ACTION_SCAN(cbs, action_scan_input_desc);
          return 0;
diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index 52b8b51469..4b78117dab 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -52,7 +52,7 @@ static int action_select_default(
 
    if (cbs->setting)
    {
-      switch (setting_get_type(cbs->setting))
+      switch (cbs->setting->type)
       {
          case ST_BOOL:
          case ST_INT:
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 122d4f6d90..0d069d5c94 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -1043,7 +1043,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
       const char *parent_group   = cbs->setting->parent_group;
 
       if (string_is_equal(parent_group, msg_hash_to_str(MENU_ENUM_LABEL_MAIN_MENU))
-            && setting_get_type(cbs->setting) == ST_GROUP)
+            && cbs->setting->type == ST_GROUP)
       {
          BIND_ACTION_GET_TITLE(cbs, action_get_title_group_settings);
          return 0;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 8da2871e25..b71db3b788 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2166,7 +2166,7 @@ static int menu_displaylist_parse_settings_internal_enum(
       bool time_to_exit             = false;
       const char *short_description = setting->short_description;
       const char *name              = setting->name;
-      enum setting_type type        = setting_get_type(setting);
+      enum setting_type type        = setting->type;
       rarch_setting_t **list        = &setting;
 
       switch (parse_type)
@@ -2234,7 +2234,7 @@ loop:
          case PARSE_GROUP:
          case PARSE_ONLY_GROUP:
          case PARSE_SUB_GROUP:
-            if (setting_get_type(setting) == precond)
+            if (setting->type == precond)
                time_to_exit = true;
             break;
          case PARSE_ONLY_BIND:
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index f98d343859..8fb04ecc71 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -330,7 +330,7 @@ static void *setting_get_ptr(rarch_setting_t *setting)
    if (!setting)
       return NULL;
 
-   switch (setting_get_type(setting))
+   switch (setting->type)
    {
       case ST_BOOL:
          return setting->value.target.boolean;
@@ -408,7 +408,7 @@ static int setting_generic_action_ok_linefeed(rarch_setting_t *setting, bool wra
 
    (void)wraparound;
 
-   switch (setting_get_type(setting))
+   switch (setting->type)
    {
       case ST_SIZE:
       case ST_UINT:
@@ -898,7 +898,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting,
    max          = setting->max;
    flags        = setting->flags;
 
-   switch (setting_get_type(setting))
+   switch (setting->type)
    {
       case ST_INT:
          sscanf(value, "%d", setting->value.target.integer);
@@ -1062,7 +1062,7 @@ static void setting_reset_setting(rarch_setting_t* setting)
    if (!setting)
       return;
 
-   switch (setting_get_type(setting))
+   switch (setting->type)
    {
       case ST_BOOL:
          *setting->value.target.boolean          = setting->default_value.boolean;
@@ -1088,7 +1088,7 @@ static void setting_reset_setting(rarch_setting_t* setting)
       case ST_DIR:
          if (setting->default_value.string)
          {
-            if (setting_get_type(setting) == ST_STRING)
+            if (setting->type == ST_STRING)
                setting_set_with_string_representation(setting, setting->default_value.string);
             else
                fill_pathname_expand_special(setting->value.target.string,
@@ -6034,7 +6034,7 @@ int menu_action_handle_setting(rarch_setting_t *setting,
    if (!setting)
       return -1;
 
-   switch (setting_get_type(setting))
+   switch (setting->type)
    {
       case ST_PATH:
          if (action == MENU_ACTION_OK)
@@ -6156,14 +6156,14 @@ rarch_setting_t *menu_setting_find(const char *label)
    if (!setting)
       return NULL;
 
-   for (; setting_get_type(setting) != ST_NONE; (*list = *list + 1))
+   for (; setting->type != ST_NONE; (*list = *list + 1))
    {
       const char *name              = setting->name;
       const char *short_description = setting->short_description;
 
       if (
             string_is_equal(label, name) &&
-            (setting_get_type(setting) <= ST_GROUP))
+            (setting->type <= ST_GROUP))
       {
          if (string_is_empty(short_description))
             break;
@@ -6190,10 +6190,10 @@ rarch_setting_t *menu_setting_find_enum(enum msg_hash_enums enum_idx)
 
    if (!setting)
       return NULL;
-   for (; setting_get_type(setting) != ST_NONE; (*list = *list + 1))
+   for (; setting->type != ST_NONE; (*list = *list + 1))
    {
       if (  setting->enum_idx == enum_idx &&
-            setting_get_type(setting) <= ST_GROUP)
+            setting->type <= ST_GROUP)
       {
          const char *short_description = setting->short_description;
          if (string_is_empty(short_description))
@@ -6214,7 +6214,7 @@ int menu_setting_set_flags(rarch_setting_t *setting)
    if (!setting)
       return 0;
 
-   switch (setting_get_type(setting))
+   switch (setting->type)
    {
       case ST_STRING_OPTIONS:
          return MENU_SETTING_STRING_OPTIONS;
@@ -17657,7 +17657,7 @@ void menu_setting_free(rarch_setting_t *setting)
    list                   = (rarch_setting_t**)&setting;
 
    /* Free data which was previously tagged */
-   for (; setting_get_type(setting) != ST_NONE; (*list = *list + 1))
+   for (; setting->type != ST_NONE; (*list = *list + 1))
       for (values = (unsigned)setting->free_flags, n = 0; values != 0; values >>= 1, n++)
          if (values & 1)
             switch (1 << n)
@@ -17863,7 +17863,7 @@ bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data)
 
             flags                    = setting->flags;
 
-            if (setting_get_type(setting) != ST_ACTION)
+            if (setting->type != ST_ACTION)
                return false;
 
             if (!setting->change_handler)
diff --git a/retroarch.c b/retroarch.c
index 3989ccc718..149fe9a6bb 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -4829,7 +4829,7 @@ enum menu_entry_type menu_entry_get_type(uint32_t i)
 
    if (setting)
    {
-      switch (setting_get_type(setting))
+      switch (setting->type)
       {
          case ST_BOOL:
             return MENU_ENTRY_BOOL;
diff --git a/setting_list.h b/setting_list.h
index a14c8112cc..d982a89ea7 100644
--- a/setting_list.h
+++ b/setting_list.h
@@ -262,7 +262,6 @@ int setting_uint_action_left_default(rarch_setting_t *setting, bool wraparound);
 int setting_uint_action_right_default(rarch_setting_t *setting, bool wraparound);
 void setting_get_string_representation_uint(rarch_setting_t *setting, char *s, size_t len);
 void setting_get_string_representation_hex_and_uint(rarch_setting_t *setting, char *s, size_t len);
-#define setting_get_type(setting) ((setting) ? setting->type : ST_NONE)
 
 RETRO_END_DECLS