diff --git a/docs/changes.txt b/docs/changes.txt
index 2c4756843..bb2dc675a 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -19,6 +19,7 @@
 - Fixed a problem with attack mode -a 7 together with stdout mode where the mask bytes were missing in the output
 - Fixed a problem with tab completion where --self-test-disable did incorrecly expect a further parameter/value
 - Fixed the ciphertext max length in Ansible Vault parser
+- Fixed speed/delay problem when quitting while the outfile folder is being scanned
 - Removed duplicate words in the dictionary file example.dict
 
 * changes v4.2.0 -> v4.2.1
diff --git a/src/outfile_check.c b/src/outfile_check.c
index 97131768e..680c7cde5 100644
--- a/src/outfile_check.c
+++ b/src/outfile_check.c
@@ -248,18 +248,20 @@ static int outfile_remove (hashcat_ctx_t *hashcat_ctx)
                             if (hashes->salts_done == hashes->salts_cnt) mycracked (hashcat_ctx);
                           }
                         }
+
+                        if (status_ctx->shutdown_inner == true) break;
                       }
 
-                      if (status_ctx->devices_status == STATUS_CRACKED) break;
+                      if (status_ctx->shutdown_inner == true) break;
                     }
                   }
 
                   if (found) break;
 
-                  if (status_ctx->devices_status == STATUS_CRACKED) break;
+                  if (status_ctx->shutdown_inner == true) break;
                 }
 
-                if (status_ctx->devices_status == STATUS_CRACKED) break;
+                if (status_ctx->shutdown_inner == true) break;
               }
 
               hcfree (line_buf);
@@ -270,6 +272,8 @@ static int outfile_remove (hashcat_ctx_t *hashcat_ctx)
 
               fclose (fp);
             }
+
+            if (status_ctx->shutdown_inner == true) break;
           }
         }
       }