diff --git a/src/main.c b/src/main.c
index 9c66f4f50..5f5f5fea8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -520,7 +520,14 @@ static void main_outerloop_mainscreen (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx,
       event_log_advice (hashcat_ctx, NULL);
     }
   }
-
+  
+  if (user_options->keep_guessing == true)
+  {
+    event_log_advice (hashcat_ctx, "ATTENTION! Keep-guessing is enabled.");
+    event_log_advice (hashcat_ctx, "This tells Hashcat to continue guessing against all target hashes until attack exhaustion.");
+    event_log_advice (hashcat_ctx, "Hashcat will NOT check for or remove targets present in the potfile and will add ALL plains/collisions found, including duplicates, to the potfile.");
+    event_log_advice (hashcat_ctx, NULL);
+  }
   /**
    * Watchdog and Temperature balance
    */
diff --git a/src/potfile.c b/src/potfile.c
index a7d3db540..c59238684 100644
--- a/src/potfile.c
+++ b/src/potfile.c
@@ -373,10 +373,13 @@ int potfile_remove_parse (hashcat_ctx_t *hashcat_ctx)
   const hashes_t       *hashes       = hashcat_ctx->hashes;
   const module_ctx_t   *module_ctx   = hashcat_ctx->module_ctx;
   const potfile_ctx_t  *potfile_ctx  = hashcat_ctx->potfile_ctx;
+  const user_options_t *user_options = hashcat_ctx->user_options;
 
   if (potfile_ctx->enabled == false) return 0;
 
   if (hashconfig->potfile_disable == true) return 0;
+  
+  if (hashconfig->opts_type & OPTS_TYPE_PT_NEVERCRACK) return 0;
 
   // if no potfile exists yet we don't need to do anything here