diff --git a/src/emu/device.c b/src/emu/device.c
index 70c690df99f..1185991c2ee 100644
--- a/src/emu/device.c
+++ b/src/emu/device.c
@@ -814,6 +814,9 @@ void device_t::remove_subdevice(device_t &device)
 	for (device_t *scan = iter.first(); scan != NULL; scan = iter.next())
 		scan->m_device_map.reset(); //remove(&device);
 
+	// reset auto finder
+	m_auto_finder_list = NULL;
+
 	// remove from our list
 	m_subdevice_list.remove(device);
 }