diff --git a/src/emu/diexec.c b/src/emu/diexec.c
index 2bee966bb8e..887b499a8d4 100644
--- a/src/emu/diexec.c
+++ b/src/emu/diexec.c
@@ -638,6 +638,17 @@ void device_execute_interface::interface_post_reset()
 
 void device_execute_interface::interface_clock_changed()
 {
+	// a clock of zero disables the device
+	if (device().clock() == 0)
+	{
+		suspend(SUSPEND_REASON_CLOCK, true);
+		return;
+	}
+
+	// if we were suspended because we had no clock, enable us now
+	if (suspended(SUSPEND_REASON_CLOCK))
+		resume(SUSPEND_REASON_CLOCK);
+
 	// recompute cps and spc
 	m_cycles_per_second = clocks_to_cycles(device().clock());
 	m_attoseconds_per_cycle = HZ_TO_ATTOSECONDS(m_cycles_per_second);
@@ -693,7 +704,11 @@ int device_execute_interface::standard_irq_callback(int irqline)
 
 attoseconds_t device_execute_interface::minimum_quantum() const
 {
-	// if we don't have that information, compute it
+	// if we don't have a clock, return a huge factor
+	if (device().clock() == 0)
+		return ATTOSECONDS_PER_SECOND - 1;
+
+	// if we don't have the quantum time, compute it
 	attoseconds_t basetick = m_attoseconds_per_cycle;
 	if (basetick == 0)
 		basetick = HZ_TO_ATTOSECONDS(clocks_to_cycles(device().clock()));
@@ -727,7 +742,7 @@ void device_execute_interface::on_vblank(screen_device &screen, bool vblank_stat
 		return;
 
 	// generate the interrupt callback
-	if (!suspended(SUSPEND_REASON_HALT | SUSPEND_REASON_RESET | SUSPEND_REASON_DISABLE))
+	if (!suspended(SUSPEND_REASON_HALT | SUSPEND_REASON_RESET | SUSPEND_REASON_DISABLE | SUSPEND_REASON_CLOCK))
 	{
 		if (m_vblank_interrupt_legacy != NULL)
 			(*m_vblank_interrupt_legacy)(&device());
@@ -750,7 +765,7 @@ TIMER_CALLBACK( device_execute_interface::static_trigger_periodic_interrupt )
 void device_execute_interface::trigger_periodic_interrupt()
 {
 	// bail if there is no routine
-	if (!suspended(SUSPEND_REASON_HALT | SUSPEND_REASON_RESET | SUSPEND_REASON_DISABLE))
+	if (!suspended(SUSPEND_REASON_HALT | SUSPEND_REASON_RESET | SUSPEND_REASON_DISABLE | SUSPEND_REASON_CLOCK))
 	{
 		if (m_timed_interrupt_legacy != NULL)
 			(*m_timed_interrupt_legacy)(&device());
diff --git a/src/emu/diexec.h b/src/emu/diexec.h
index 6be96c102e7..86f5078572f 100644
--- a/src/emu/diexec.h
+++ b/src/emu/diexec.h
@@ -58,6 +58,7 @@ const UINT32 SUSPEND_REASON_SPIN        = 0x0004;   // currently spinning
 const UINT32 SUSPEND_REASON_TRIGGER     = 0x0008;   // waiting for a trigger
 const UINT32 SUSPEND_REASON_DISABLE     = 0x0010;   // disabled (due to disable flag)
 const UINT32 SUSPEND_REASON_TIMESLICE   = 0x0020;   // waiting for the next timeslice
+const UINT32 SUSPEND_REASON_CLOCK       = 0x0040;   // currently not clocked
 const UINT32 SUSPEND_ANY_REASON         = ~0;       // all of the above