diff --git a/Assets/gamedb/gamedb_sega_md.txt b/Assets/gamedb/gamedb_sega_md.txt
index 4cc52f43f8..da0ed81046 100644
--- a/Assets/gamedb/gamedb_sega_md.txt
+++ b/Assets/gamedb/gamedb_sega_md.txt
@@ -5858,19 +5858,19 @@ AE3A42C6297EF25C6018A209FDA0194E		Star Wars Arcade (32X) (U) [!]	GEN
 E93C5656EB04C97A9CD37B6F56C19323		Super-X Raycasting Engine Test 1 by Fonzie (32X) (PD)	GEN
 024773EAB6B3AACD7D4528F18C110D60		Super-X Raycasting Engine Test 2 by Fonzie (32X) (PD)	GEN
 9349B07AF5CF6C7DD39EA0E43AE6A29D		Switching CRAM Palettes by DevSter (32X) (PD)	GEN
-1B06C84CAF09206A8D9F0BB3EAABA512		T-MEK (32X) (W) [!]	GEN
-30989C83D4E4EA3C35A1F3E2620B8465		Tempo (32X) (JU) [!]	GEN
-386D99D132CE5699ADE81B4473CEF5B4		Toughman Contest (32X) (W) [!]	GEN
-ADCF6C6150D1BC3D073D3754B22EBC69		Virtua Fighter (32X) (E) [!]	GEN
-17DE0712018B95CD307A4C7C835EE426		Virtua Fighter (32X) (E) [b1]	GEN
-901E97C9F731FBDF1F1EAD0FBF58249A		Virtua Fighter (32X) (JU) [!]	GEN
-C30A6430B1A7E819BD2DDE63A41D4D57		Virtua Racing Deluxe (32X) (E) [!]	GEN
-FB8B10729078DE36A736BC4DECAE97D6		Virtua Racing Deluxe (32X) (E) [b1]	GEN
-31D1280D97A866C35180ACDDBBE0BA34		Virtua Racing Deluxe (32X) (E) [h1C]	GEN
-08CAE0A96D9EE07001C6E1C247D407C6		Virtua Racing Deluxe (32X) (J) [!]	GEN
-72B1AD0F949F68DA7D0A6339ECD51A3F		Virtua Racing Deluxe (32X) (U) [!]	GEN
-4D14EAB0585E79E2FC4789E090755F2D		World Series Baseball '95 (32X) (U) [!]	GEN
-B3788F861803D21CFA0E559695835F44		WWF RAW (32X) (W) [!]	GEN
-8456CAE9975BA6CB041C4EF2BE54B1A1		WWF Wrestlemania Arcade (32X) (W) [!]	GEN
-FEF67ECDF8C5369BA4ACAFAC99C768B5		XOR Palette Demo by DevSter (32X) (PD)	GEN
-BD32A5E46D0159DC88CB31EA4BD9D899		Zaxxon's Motherbase 2000 (32X) (JU) [!]	GEN
\ No newline at end of file
+1B06C84CAF09206A8D9F0BB3EAABA512		T-MEK (32X) (W) [!]	GEN		32X=true		pico
+30989C83D4E4EA3C35A1F3E2620B8465		Tempo (32X) (JU) [!]	GEN		32X=true		pico
+386D99D132CE5699ADE81B4473CEF5B4		Toughman Contest (32X) (W) [!]	GEN		32X=true		pico
+ADCF6C6150D1BC3D073D3754B22EBC69		Virtua Fighter (32X) (E) [!]	GEN		32X=true		pico
+17DE0712018B95CD307A4C7C835EE426		Virtua Fighter (32X) (E) [b1]	GEN		32X=true		pico
+901E97C9F731FBDF1F1EAD0FBF58249A		Virtua Fighter (32X) (JU) [!]	GEN		32X=true		pico
+C30A6430B1A7E819BD2DDE63A41D4D57		Virtua Racing Deluxe (32X) (E) [!]	GEN		32X=true		pico
+FB8B10729078DE36A736BC4DECAE97D6	B	Virtua Racing Deluxe (32X) (E) [b1]	GEN		32X=true		pico
+31D1280D97A866C35180ACDDBBE0BA34		Virtua Racing Deluxe (32X) (E) [h1C]	GEN		32X=true		pico
+08CAE0A96D9EE07001C6E1C247D407C6		Virtua Racing Deluxe (32X) (J) [!]	GEN		32X=true		pico
+72B1AD0F949F68DA7D0A6339ECD51A3F		Virtua Racing Deluxe (32X) (U) [!]	GEN		32X=true		pico
+4D14EAB0585E79E2FC4789E090755F2D		World Series Baseball '95 (32X) (U) [!]	GEN		32X=true		pico
+B3788F861803D21CFA0E559695835F44		WWF RAW (32X) (W) [!]	GEN		32X=true		pico
+8456CAE9975BA6CB041C4EF2BE54B1A1		WWF Wrestlemania Arcade (32X) (W) [!]	GEN		32X=true		pico
+FEF67ECDF8C5369BA4ACAFAC99C768B5		XOR Palette Demo by DevSter (32X) (PD)	GEN		32X=true		pico
+BD32A5E46D0159DC88CB31EA4BD9D899		Zaxxon's Motherbase 2000 (32X) (JU) [!]	GEN		32X=true		pico
\ No newline at end of file
diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index bf48e04e7b..528f4df638 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -910,7 +910,15 @@ namespace BizHawk.Client.Common
 								nextEmulator.CoreComm.RomStatusDetails = "PSX etc.";
 								break;
 							case "GEN":
-								core = CoreInventory.Instance["GEN", "Genplus-gx"];
+								if (Global.Config.CoreForcingViaGameDB && game.ForcedCore?.ToLower() == "pico")
+								{
+									core = CoreInventory.Instance["GEN", "PicoDrive"];
+								}
+								else
+								{
+									core = CoreInventory.Instance["GEN", "Genplus-gx"];
+								}
+
 								break;
 						}