diff --git a/src/main/java/dan200/computercraft/core/computer/Computer.java b/src/main/java/dan200/computercraft/core/computer/Computer.java
index 6b3840e8f..847d49d1c 100644
--- a/src/main/java/dan200/computercraft/core/computer/Computer.java
+++ b/src/main/java/dan200/computercraft/core/computer/Computer.java
@@ -285,7 +285,7 @@ public class Computer
     {
         synchronized( this )
         {
-            if( m_state == State.Running )
+            if( m_state != State.Off && m_machine != null )
             {
                 if( hard ) 
                 {