diff --git a/cfg.cpp b/cfg.cpp
index 8624d09..db76347 100644
--- a/cfg.cpp
+++ b/cfg.cpp
@@ -72,6 +72,8 @@ static const ini_var_t ini_vars[] =
 	{ "BROWSE_EXPAND", (void*)(&(cfg.browse_expand)), UINT8, 0, 1 },
 	{ "LOGO", (void*)(&(cfg.logo)), UINT8, 0, 1 },
 	{ "SHARED_FOLDER", (void*)(&(cfg.shared_folder)), STRING, 0, sizeof(cfg.shared_folder) - 1 },
+	{ "NO_MERGE_VID", (void*)(&(cfg.no_merge_vid)), UINT16, 0, 0xFFFF },
+	{ "NO_MERGE_PID", (void*)(&(cfg.no_merge_pid)), UINT16, 0, 0xFFFF },
 };
 
 static const int nvars = (int)(sizeof(ini_vars) / sizeof(ini_var_t));
diff --git a/cfg.h b/cfg.h
index 8d8caac..87e4218 100644
--- a/cfg.h
+++ b/cfg.h
@@ -42,6 +42,8 @@ typedef struct {
 	uint8_t recents;
 	uint16_t jamma_vid;
 	uint16_t jamma_pid;
+	uint16_t no_merge_vid;
+	uint16_t no_merge_pid;
 	uint8_t sniper_mode;
 	uint8_t browse_expand;
 	uint8_t logo;
diff --git a/input.cpp b/input.cpp
index 0016d4a..f883d84 100644
--- a/input.cpp
+++ b/input.cpp
@@ -2724,6 +2724,11 @@ void mergedevs()
 	make_unique(0x0E8F, 0x3013, 1); // Mayflash SNES controller 2 port adapter
 	make_unique(0x16C0, 0x05E1, 1); // XinMo XM-10 2 player USB Encoder
 
+	if (cfg.no_merge_vid)
+	{
+		make_unique(cfg.no_merge_vid, cfg.no_merge_pid, (cfg.no_merge_pid ? 1 : 0));
+	}
+
 	// merge multifunctional devices by id
 	for (int i = 0; i < NUMDEV; i++)
 	{