diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index eeef413add..3cd2132cf2 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2048,9 +2048,10 @@ static int menu_displaylist_parse_settings_internal(void *data,
       )
 {
    enum setting_type precond;
-   size_t             count  = 0;
-   uint64_t flags            = 0;
-   settings_t *settings      = config_get_ptr();
+   size_t             count    = 0;
+   uint64_t flags              = 0;
+   settings_t *settings        = config_get_ptr();
+   bool show_advanced_settings = settings->bools.menu_show_advanced_settings;
 
    if (!setting)
       return -1;
@@ -2177,17 +2178,16 @@ static int menu_displaylist_parse_settings_internal(void *data,
             goto loop;
       }
 
-#ifdef HAVE_LAKKA
-      if ((flags & SD_FLAG_ADVANCED || flags & SD_FLAG_LAKKA_ADVANCED) &&
-            !settings->bools.menu_show_advanced_settings)
+      if ((flags & SD_FLAG_ADVANCED) &&
+            !show_advanced_settings)
          goto loop;
-#else
-      if (flags & SD_FLAG_ADVANCED &&
-            !settings->bools.menu_show_advanced_settings)
+
+#ifdef HAVE_LAKKA
+      if ((flags & SD_FLAG_LAKKA_ADVANCED) &&
+            !show_advanced_settings)
          goto loop;
 #endif
 
-
       menu_entries_append(info->list, short_description,
             name, menu_setting_set_flags(setting), 0, 0);
       count++;