diff --git a/src/main/java/nl/martijndwars/webpush/AbstractPushService.java b/src/main/java/nl/martijndwars/webpush/AbstractPushService.java
index 22db83b..f3f25ed 100644
--- a/src/main/java/nl/martijndwars/webpush/AbstractPushService.java
+++ b/src/main/java/nl/martijndwars/webpush/AbstractPushService.java
@@ -166,7 +166,7 @@ protected final HttpRequest prepareRequest(Notification notification, Encoding e
             } else if (encoding == Encoding.AESGCM) {
                 headers.put("Content-Encoding", "aesgcm");
                 headers.put("Encryption", "salt=" + Base64.getUrlEncoder().withoutPadding().encodeToString(salt));
-                headers.put("Crypto-Key", "dh=" + Base64.getUrlEncoder().encodeToString(dh));
+                headers.put("Crypto-Key", "dh=" + Base64.getUrlEncoder().withoutPadding().encodeToString(dh));
             }
 
             body = encrypted.getCiphertext();
@@ -208,9 +208,9 @@ protected final HttpRequest prepareRequest(Notification notification, Encoding e
             }
 
             if (headers.containsKey("Crypto-Key")) {
-                headers.put("Crypto-Key", headers.get("Crypto-Key") + ";p256ecdsa=" + Base64.getUrlEncoder().encodeToString(pk));
+                headers.put("Crypto-Key", headers.get("Crypto-Key") + ";p256ecdsa=" + Base64.getUrlEncoder().withoutPadding().encodeToString(pk));
             } else {
-                headers.put("Crypto-Key", "p256ecdsa=" + Base64.getUrlEncoder().encodeToString(pk));
+                headers.put("Crypto-Key", "p256ecdsa=" + Base64.getUrlEncoder().withoutPadding().encodeToString(pk));
             }
         } else if (notification.isFcm() && getGcmApiKey() != null) {
             headers.put("Authorization", "key=" + getGcmApiKey());
diff --git a/src/main/java/nl/martijndwars/webpush/cli/handlers/GenerateKeyHandler.java b/src/main/java/nl/martijndwars/webpush/cli/handlers/GenerateKeyHandler.java
index 6ddf519..1747adf 100644
--- a/src/main/java/nl/martijndwars/webpush/cli/handlers/GenerateKeyHandler.java
+++ b/src/main/java/nl/martijndwars/webpush/cli/handlers/GenerateKeyHandler.java
@@ -42,10 +42,10 @@ public void run() throws InvalidAlgorithmParameterException, NoSuchAlgorithmExce
         }
 
         System.out.println("PublicKey:");
-        System.out.println(Base64.getUrlEncoder().encodeToString(encodedPublicKey));
+        System.out.println(Base64.getUrlEncoder().withoutPadding().encodeToString(encodedPublicKey));
 
         System.out.println("PrivateKey:");
-        System.out.println(Base64.getUrlEncoder().encodeToString(encodedPrivateKey));
+        System.out.println(Base64.getUrlEncoder().withoutPadding().encodeToString(encodedPrivateKey));
     }
 
     /**