diff --git a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c
index a3c6d158..88df3388 100644
--- a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c
+++ b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c
@@ -111,7 +111,7 @@ int fill_segment_ref(const argon2_instance_t *instance,
     uint32_t prev_offset, curr_offset;
     uint32_t starting_index;
     uint32_t i;
-    int data_independent_addressing;
+    const int data_independent_addressing = 1; /* instance->type == Argon2_i */
     /* Pseudo-random values that determine the reference block position */
     uint64_t *pseudo_rands = NULL;
 
@@ -119,8 +119,6 @@ int fill_segment_ref(const argon2_instance_t *instance,
         return ARGON2_OK;
     }
 
-    data_independent_addressing = (instance->type == Argon2_i);
-
     pseudo_rands =
         (uint64_t *)malloc(sizeof(uint64_t) * (instance->segment_length));
 
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 a57eb1c3..8129c9ce 100644
--- a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c
+++ b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c
@@ -105,7 +105,7 @@ int fill_segment_ssse3(const argon2_instance_t *instance,
     uint32_t prev_offset, curr_offset;
     uint32_t starting_index, i;
     __m128i state[64];
-    int data_independent_addressing;
+    const int data_independent_addressing = 1; /* instance->type == Argon2_i */
 
     /* Pseudo-random values that determine the reference block position */
     uint64_t *pseudo_rands = NULL;
@@ -114,8 +114,6 @@ int fill_segment_ssse3(const argon2_instance_t *instance,
         return ARGON2_OK;
     }
 
-    data_independent_addressing = (instance->type == Argon2_i);
-
     pseudo_rands =
         (uint64_t *)malloc(sizeof(uint64_t) * instance->segment_length);
     if (pseudo_rands == NULL) {