diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/CreateSavepointsProcedure.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/CreateSavepointsProcedure.scala
index ed4905ed047a7..43098d1e9832b 100644
--- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/CreateSavepointsProcedure.scala
+++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/CreateSavepointsProcedure.scala
@@ -68,6 +68,8 @@ class CreateSavepointsProcedure extends BaseProcedure with ProcedureBuilder with
     } catch {
       case _: HoodieSavepointException =>
         logWarning(s"Failed: Could not create savepoint $commitTime.")
+    } finally {
+      client.close()
     }
 
     Seq(Row(result))
diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/DeleteSavepointsProcedure.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/DeleteSavepointsProcedure.scala
index 11416ac22c56f..fcef175ebdf81 100644
--- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/DeleteSavepointsProcedure.scala
+++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/DeleteSavepointsProcedure.scala
@@ -67,6 +67,8 @@ class DeleteSavepointsProcedure extends BaseProcedure with ProcedureBuilder with
     } catch {
       case _: HoodieSavepointException =>
         logWarning(s"Failed: Could not delete savepoint $instantTime.")
+    } finally {
+      client.close()
     }
 
     Seq(Row(result))
diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackSavepointsProcedure.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackSavepointsProcedure.scala
index a11e614176f57..fa8f33d3068d2 100644
--- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackSavepointsProcedure.scala
+++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackSavepointsProcedure.scala
@@ -67,6 +67,8 @@ class RollbackSavepointsProcedure extends BaseProcedure with ProcedureBuilder wi
     } catch {
       case _: HoodieSavepointException =>
         logWarning(s"The commit $instantTime failed to roll back.")
+    } finally {
+      client.close()
     }
 
     Seq(Row(result))