diff --git a/src/stream/chacha/chacha_ivctr32.c b/src/stream/chacha/chacha_ivctr32.c
index 14780f8..9884a1e 100644
--- a/src/stream/chacha/chacha_ivctr32.c
+++ b/src/stream/chacha/chacha_ivctr32.c
@@ -36,6 +36,7 @@ int chacha_ivctr32(chacha_state *st, const unsigned char *iv, unsigned long ivle
    LOAD32L(st->input[14], iv + 4);
    LOAD32L(st->input[15], iv + 8);
    st->ksleft = 0;
+   st->ivlen = ivlen;
    return CRYPT_OK;
 }
 
diff --git a/src/stream/chacha/chacha_ivctr64.c b/src/stream/chacha/chacha_ivctr64.c
index 6a6c43d..82d39fb 100644
--- a/src/stream/chacha/chacha_ivctr64.c
+++ b/src/stream/chacha/chacha_ivctr64.c
@@ -36,6 +36,7 @@ int chacha_ivctr64(chacha_state *st, const unsigned char *iv, unsigned long ivle
    LOAD32L(st->input[14], iv + 0);
    LOAD32L(st->input[15], iv + 4);
    st->ksleft = 0;
+   st->ivlen = ivlen;
    return CRYPT_OK;
 }
 
diff --git a/src/stream/chacha/chacha_setup.c b/src/stream/chacha/chacha_setup.c
index 04c43b8..69a1483 100644
--- a/src/stream/chacha/chacha_setup.c
+++ b/src/stream/chacha/chacha_setup.c
@@ -53,7 +53,8 @@ int chacha_setup(chacha_state *st, const unsigned char *key, unsigned long keyle
    LOAD32L(st->input[1],  constants + 4);
    LOAD32L(st->input[2],  constants + 8);
    LOAD32L(st->input[3],  constants + 12);
-   st->rounds  = rounds; /* e.g. 20 for chacha20 */
+   st->rounds = rounds; /* e.g. 20 for chacha20 */
+   st->ivlen = 0; /* will be set later by chacha_ivctr(32|64) */
    return CRYPT_OK;
 }