diff --git a/src/hashcat.c b/src/hashcat.c
index 1f95f17f8..80282e17c 100644
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -18125,6 +18125,11 @@ int main (int argc, char **argv)
          * create cracker threads
          */
 
+        if (data.devices_status == STATUS_STOP_AT_CHECKPOINT) check_checkpoint ();
+
+        if (data.devices_status == STATUS_ABORTED) break;
+        if (data.devices_status == STATUS_QUIT)    break;
+
         data.devices_status = STATUS_RUNNING;
 
         if (initial_restore_done == 0)