diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c
index f3bb54a5422..6ef83f2e0ec 100644
--- a/src/emu/mconfig.c
+++ b/src/emu/mconfig.c
@@ -85,7 +85,8 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options)
 					if (strcmp(selval, intf[i].name) == 0) {
 						device_t *new_dev = device_add(&owner, intf[i].name, intf[i].devtype, 0);
 						found = true;
-						if (!options.exists(owner.tag()))
+						const char *def = slot->get_default_card(devicelist(), options);
+						if ((def!=NULL) && (strcmp(def,selval)==0))
 							device_t::static_set_input_default(*new_dev, slot->input_ports_defaults());
 					}
 				}