diff --git a/cdap-app-templates/cdap-etl/cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/service/OAuthHandler.java b/cdap-app-templates/cdap-etl/cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/service/OAuthHandler.java
index e07566db60ef..7d578dc2d4a7 100644
--- a/cdap-app-templates/cdap-etl/cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/service/OAuthHandler.java
+++ b/cdap-app-templates/cdap-etl/cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/service/OAuthHandler.java
@@ -413,7 +413,7 @@ private HttpRequest createGetAccessTokenRequest(OAuthProvider provider, String r
 
   private String getBasicAuthHeader(OAuthClientCredentials clientCreds) {
     String authInfo = String.format("%s:%s", clientCreds.getClientId(), clientCreds.getClientSecret());
-    return String.format("Basic %s", Base64.getEncoder().encode(authInfo.getBytes()));
+    return String.format("Basic %s", Base64.getEncoder().encodeToString(authInfo.getBytes()));
   }
 
   private OAuthProvider getProvider(String provider) throws OAuthServiceException {