diff --git a/crypto/api.c b/crypto/api.c
index e26156f..34e02ca 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -165,7 +165,7 @@
 		break;
 	}
 
-	return len + alg->cra_alignmask;
+	return len + (alg->cra_alignmask & ~(crypto_tfm_ctx_alignment() - 1));
 }
 
 struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)