diff --git a/content.c b/content.c
index f1315e6e4c..4abebcc1ba 100644
--- a/content.c
+++ b/content.c
@@ -576,7 +576,7 @@ bool init_content_file(void)
       attr.i |= global->system.info.need_fullpath << 1;
       attr.i |= (!global->system.no_content) << 2;
       string_list_append(content,
-            global->libretro_no_content ? "" : global->fullpath, attr);
+            (global->libretro_no_content && settings->core.set_supports_no_game_enable) ? "" : global->fullpath, attr);
    }
 
 #ifdef HAVE_ZLIB