diff --git a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/DefaultCMSEncryptionConfig.java b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/DefaultCMSEncryptionConfig.java
index 525ce7356..1dd0c3d58 100644
--- a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/DefaultCMSEncryptionConfig.java
+++ b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/DefaultCMSEncryptionConfig.java
@@ -15,6 +15,6 @@ public class DefaultCMSEncryptionConfig implements CMSEncryptionConfig {
 
     @Inject
     public DefaultCMSEncryptionConfig() {
-        algorithm = DatasafeCryptoAlgorithm.AES256_CBC;
+        algorithm = DatasafeCryptoAlgorithm.AES256_GCM;
     }
 }