diff --git a/src/hashcat.c b/src/hashcat.c
index d7a82ea0f..0153e096a 100644
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -509,7 +509,7 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
 
   if (status_ctx->devices_status == STATUS_CRACKED)
   {
-    if (user_options->remove == true)
+    if ((user_options->remove == true) && (hashes->hashlist_mode == HL_MODE_FILE))
     {
       if (hashes->digests_saved != hashes->digests_done)
       {
@@ -698,7 +698,7 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
 
   if (status_ctx->devices_status == STATUS_CRACKED)
   {
-    if (user_options->remove == true)
+    if ((user_options->remove == true) && (hashes->hashlist_mode == HL_MODE_FILE))
     {
       if (hashes->digests_saved != hashes->digests_done)
       {