diff --git a/src/rc_libretro.c b/src/rc_libretro.c
index 4facc14a..d07cce9e 100644
--- a/src/rc_libretro.c
+++ b/src/rc_libretro.c
@@ -96,6 +96,11 @@ static const rc_disallowed_setting_t _rc_disallowed_mesen_s_settings[] = {
   { NULL, NULL }
 };
 
+static const rc_disallowed_setting_t _rc_disallowed_neocd_settings[] = {
+  { "neocd_bios", "uni-bios*" },
+  { NULL, NULL }
+};
+
 static const rc_disallowed_setting_t _rc_disallowed_pcsx_rearmed_settings[] = {
   { "pcsx_rearmed_region", "pal" },
   { NULL, NULL }
@@ -152,6 +157,7 @@ static const rc_disallowed_core_settings_t rc_disallowed_core_settings[] = {
   { "Genesis Plus GX Wide", _rc_disallowed_gpgx_wide_settings },
   { "Mesen", _rc_disallowed_mesen_settings },
   { "Mesen-S", _rc_disallowed_mesen_s_settings },
+  { "NeoCD", _rc_disallowed_neocd_settings },
   { "PPSSPP", _rc_disallowed_ppsspp_settings },
   { "PCSX-ReARMed", _rc_disallowed_pcsx_rearmed_settings },
   { "PicoDrive", _rc_disallowed_picodrive_settings },
diff --git a/src/rhash/hash.c b/src/rhash/hash.c
index 06fc03f2..0cc5fb4e 100644
--- a/src/rhash/hash.c
+++ b/src/rhash/hash.c
@@ -2594,7 +2594,8 @@ void rc_hash_initialize_iterator(struct rc_hash_iterator* iterator, const char*
           iterator->consoles[4] = RC_CONSOLE_PSP;
           iterator->consoles[5] = RC_CONSOLE_PC_ENGINE_CD;
           iterator->consoles[6] = RC_CONSOLE_3DO;
-          iterator->consoles[7] = RC_CONSOLE_PCFX;
+          iterator->consoles[7] = RC_CONSOLE_NEO_GEO_CD;
+          iterator->consoles[8] = RC_CONSOLE_PCFX;
           need_path = 1;
         }
         else if (rc_path_compare_extension(ext, "col"))
diff --git a/test/test_rc_libretro.c b/test/test_rc_libretro.c
index 122fd069..cbcba767 100644
--- a/test/test_rc_libretro.c
+++ b/test/test_rc_libretro.c
@@ -676,6 +676,9 @@ void test_rc_libretro(void) {
   TEST_PARAMS3(test_allowed_setting,    "Mesen-S", "mesen-s_region", "NTSC");
   TEST_PARAMS3(test_disallowed_setting, "Mesen-S", "mesen-s_region", "PAL");
 
+  TEST_PARAMS3(test_allowed_setting,    "NeoCD", "neocd_bios", "neocd.bin (CDZ)");
+  TEST_PARAMS3(test_disallowed_setting, "NeoCD", "neocd_bios", "uni-bioscd.rom (CDZ, Universe 3.3)");
+
   TEST_PARAMS3(test_allowed_setting,    "PPSSPP", "ppsspp_cheats", "disabled");
   TEST_PARAMS3(test_disallowed_setting, "PPSSPP", "ppsspp_cheats", "enabled");