diff --git a/ThirdParty/delphi-jose-jwt/Source/JOSE.Encoding.Base64.pas b/ThirdParty/delphi-jose-jwt/Source/JOSE.Encoding.Base64.pas
index 542f6d26..d536da73 100644
--- a/ThirdParty/delphi-jose-jwt/Source/JOSE.Encoding.Base64.pas
+++ b/ThirdParty/delphi-jose-jwt/Source/JOSE.Encoding.Base64.pas
@@ -88,8 +88,7 @@ class function TBase64.URLEncode(const ASource: TSuperBytes): TSuperBytes;
   LBase64Str := StringReplace(LBase64Str, #13#10, '', [rfReplaceAll]);
   LBase64Str := StringReplace(LBase64Str, #13, '', [rfReplaceAll]);
   LBase64Str := StringReplace(LBase64Str, #10, '', [rfReplaceAll]);
-
-  LBase64Str := TrimRight(LBase64Str);
+  LBase64Str := LBase64Str.TrimRight(['=']);
 
   LBase64Str := StringReplace(LBase64Str, '+', '-', [rfReplaceAll]);
   LBase64Str := StringReplace(LBase64Str, '/', '_', [rfReplaceAll]);