diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
index c55478647a14..ee25fc50c534 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
@@ -351,16 +351,11 @@ public static SCMRatisResponse submitScmCertsToRatis(RaftGroup raftGroup,
         .setRetryPolicy(
             RetryPolicies.retryUpToMaximumCountWithFixedSleep(120,
                 TimeDuration.valueOf(500, TimeUnit.MILLISECONDS)));
-    RaftClient raftClient =  builder.build();
-
-    CompletableFuture<RaftClientReply> future =
-        raftClient.async().send(message);
-
-    RaftClientReply raftClientReply = future.get();
-
-    return SCMRatisResponse.decode(raftClientReply);
-
+    try (RaftClient raftClient = builder.build()) {
+      CompletableFuture<RaftClientReply> future =
+          raftClient.async().send(message);
+      RaftClientReply raftClientReply = future.get();
+      return SCMRatisResponse.decode(raftClientReply);
+    }
   }
-
-
 }