diff --git a/mas-foundation/src/main/java/com/ca/mas/core/security/AndroidMKeyRepository.java b/mas-foundation/src/main/java/com/ca/mas/core/security/AndroidMKeyRepository.java
index 696ea2347..83d0f7680 100644
--- a/mas-foundation/src/main/java/com/ca/mas/core/security/AndroidMKeyRepository.java
+++ b/mas-foundation/src/main/java/com/ca/mas/core/security/AndroidMKeyRepository.java
@@ -59,7 +59,7 @@ KeyGenParameterSpec.Builder getKeyGenParameterSpecBuilder(String alias, Generate
                 .setRandomizedEncryptionRequired(false)
                 .setBlockModes(BLOCK_MODE_CBC, BLOCK_MODE_CTR, BLOCK_MODE_ECB, BLOCK_MODE_GCM)
                 .setDigests(DIGEST_NONE, DIGEST_MD5, DIGEST_SHA1, DIGEST_SHA256, DIGEST_SHA384, DIGEST_SHA512)
-                .setEncryptionPaddings(ENCRYPTION_PADDING_PKCS7, ENCRYPTION_PADDING_RSA_OAEP, ENCRYPTION_PADDING_RSA_PKCS1)
+                .setEncryptionPaddings(ENCRYPTION_PADDING_PKCS7, ENCRYPTION_PADDING_RSA_OAEP, KeyProperties.ENCRYPTION_PADDING_NONE)
                 .setSignaturePaddings(SIGNATURE_PADDING_RSA_PSS, SIGNATURE_PADDING_RSA_PKCS1);
     }