diff --git a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientConfiguration.java b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientConfiguration.java
index f00ee1b..0150b0a 100644
--- a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientConfiguration.java
+++ b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientConfiguration.java
@@ -543,6 +543,10 @@ public byte[] getKeyStoreBytes() {
      * @param keyStoreBytes Byte data with the key store.
      */
     public void setKeyStoreBytes(byte[] keyStoreBytes) {
+        if (keyStoreBytes == null) {
+            this.keyStoreBytes = null;
+            return;
+        }
         this.keyStoreBytes = Arrays.copyOf(keyStoreBytes, keyStoreBytes.length);
     }
 
@@ -643,6 +647,10 @@ public byte[] getTrustStoreBytes() {
      * @param trustStoreBytes Byte data with the trust store.
      */
     public void setTrustStoreBytes(byte[] trustStoreBytes) {
+        if (trustStoreBytes == null) {
+            this.trustStoreBytes = null;
+            return;
+        }
         this.trustStoreBytes = Arrays.copyOf(trustStoreBytes, trustStoreBytes.length);
     }