diff --git a/docs/changes.txt b/docs/changes.txt
index ebd0d83c2..2fcf934d3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -24,6 +24,7 @@
 
 - Fixed truncation of password after position 32 with the combinator attack
 - Fixed DEScrypt cracking in BF mode in case the hashlist contains more than 16 times the same salt
+- Fixed use of option --keyspace in combination with -m 2500 (WPA)
 
 * changes v3.20 -> v3.30:
 
diff --git a/src/hashes.c b/src/hashes.c
index 44f4e2655..2ac7dd325 100644
--- a/src/hashes.c
+++ b/src/hashes.c
@@ -457,7 +457,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
 
   u32 hashes_avail = 0;
 
-  if ((user_options->benchmark == false) && (user_options->stdout_flag == false))
+  if ((user_options->benchmark == false) && (user_options->stdout_flag == false) && (user_options->keyspace == false))
   {
     hc_stat_t f;