diff --git a/src/emu/imagedev/chd_cd.c b/src/emu/imagedev/chd_cd.c
index a8a98ccdbe9..8db02a40b66 100644
--- a/src/emu/imagedev/chd_cd.c
+++ b/src/emu/imagedev/chd_cd.c
@@ -101,6 +101,8 @@ void cdrom_image_device::device_stop()
 {
 	if (m_cdrom_handle)
 		cdrom_close(m_cdrom_handle);
+	if( m_self_chd.opened() )
+		m_self_chd.close();
 }
 
 bool cdrom_image_device::call_load()
@@ -148,4 +150,6 @@ void cdrom_image_device::call_unload()
 	assert(m_cdrom_handle);
 	cdrom_close(m_cdrom_handle);
 	m_cdrom_handle = NULL;
+	if( m_self_chd.opened() )
+		m_self_chd.close();
 }