diff --git a/crypto-lib/libs/libcdoc.jar b/crypto-lib/libs/libcdoc.jar
index a8dbff95..caf82633 100644
Binary files a/crypto-lib/libs/libcdoc.jar and b/crypto-lib/libs/libcdoc.jar differ
diff --git a/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so
index 243e150d..e7698e7b 100644
Binary files a/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so differ
diff --git a/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so
index 01e6eb93..f3ab3994 100644
Binary files a/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so differ
diff --git a/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so
index 8670adc5..a6de9db6 100644
Binary files a/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so b/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so
index 243e150d..e7698e7b 100644
Binary files a/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so b/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so
index 01e6eb93..f3ab3994 100644
Binary files a/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so b/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so
index 8670adc5..a6de9db6 100644
Binary files a/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt
index 42520b86..1d068d2d 100644
--- a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt
+++ b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt
@@ -373,10 +373,6 @@ class CryptoContainer
 
                 val cdocWriter = CDocWriter.createWriter(version, file.path, conf, null, network)
                 try {
-                    if (cdocWriter.beginEncryption() != 0L) {
-                        throw CryptoException("Failed to begin encryption")
-                    }
-
                     withContext(IO) {
                         if (version == 2 && cdoc2Settings.getUseOnlineEncryption()) {
                             val serverId = cdoc2Settings.getCDOC2UUID()
@@ -395,7 +391,9 @@ class CryptoContainer
                             }
                         }
                     }
-
+                    if (cdocWriter.beginEncryption() != 0L) {
+                        throw CryptoException("Failed to begin encryption")
+                    }
                     withContext(IO) {
                         dataFiles.forEach { dataFile ->
                             val ifs: InputStream = FileInputStream(dataFile)