diff --git a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx2.c b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx2.c
index e10a5073..8acb42ca 100644
--- a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx2.c
+++ b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx2.c
@@ -148,7 +148,7 @@ fill_segment_avx2(const argon2_instance_t *instance,
     uint64_t  pseudo_rand, ref_index, ref_lane;
     uint32_t  prev_offset, curr_offset;
     uint32_t  starting_index, i;
-    __m256i   state[32];
+    __m256i   state[ARGON2_HWORDS_IN_BLOCK];
     int       data_independent_addressing = 1;
 
     /* Pseudo-random values that determine the reference block position */
diff --git a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c
index 778302e5..796c4455 100644
--- a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c
+++ b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c
@@ -147,7 +147,7 @@ fill_segment_ssse3(const argon2_instance_t *instance,
     uint64_t  pseudo_rand, ref_index, ref_lane;
     uint32_t  prev_offset, curr_offset;
     uint32_t  starting_index, i;
-    __m128i   state[64];
+    __m128i   state[ARGON2_OWORDS_IN_BLOCK];
     int       data_independent_addressing = 1;
 
     /* Pseudo-random values that determine the reference block position */