diff --git a/docs/changes.txt b/docs/changes.txt
index f895126ec..a46243c8e 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -13,6 +13,7 @@
 - Fixed a hash parsing problem when using --show/--left together with hashes with long salts that require pure kernels
 - Fixed a hash parsing problem for 7-Zip hashes: allow a longer crc32 data length field within the hash format
 - Fixed the output of --show if $HEX[] passwords are present within the potfile
+- Fixed a restore issue leading to "Restore value is greater than keyspace" in case mask-files or wordlist-folders were used
 
 ##
 ## Improvements
diff --git a/src/hashcat.c b/src/hashcat.c
index 912ce7486..afb7f631e 100644
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -377,7 +377,10 @@ static int inner1_loop (hashcat_ctx_t *hashcat_ctx)
       if (status_ctx->run_main_level3 == false) break;
     }
 
-    if (straight_ctx->dicts_pos + 1 == straight_ctx->dicts_cnt) straight_ctx->dicts_pos = 0;
+    if (status_ctx->run_main_level3 == true)
+    {
+      if (straight_ctx->dicts_pos + 1 == straight_ctx->dicts_cnt) straight_ctx->dicts_pos = 0;
+    }
   }
   else
   {
@@ -766,7 +769,10 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
       if (status_ctx->run_main_level2 == false) break;
     }
 
-    if (mask_ctx->masks_pos + 1 == mask_ctx->masks_cnt) mask_ctx->masks_pos = 0;
+    if (status_ctx->run_main_level2 == true)
+    {
+      if (mask_ctx->masks_pos + 1 == mask_ctx->masks_cnt) mask_ctx->masks_pos = 0;
+    }
   }
   else
   {