diff --git a/src/main/java/com/crypto/codec/Base64.java b/src/main/java/com/crypto/codec/Base64.java
index 130c81ae5219..9d1ff91c2491 100644
--- a/src/main/java/com/crypto/codec/Base64.java
+++ b/src/main/java/com/crypto/codec/Base64.java
@@ -135,8 +135,8 @@ public static byte[] decode(String base64String) {
         if (base64String == null) {
             throw new IllegalArgumentException("Base64 string must not be null!");
         }
-
-        base64String = base64String.strip();
+        // remove trailing spaces if any
+        base64String = base64String.trim();
         if (!isValidBase64String(base64String)) {
             throw new IllegalArgumentException("String is not a valid Base64 string!");
         }