diff --git a/src/main/java/org/tikv/common/TiSession.java b/src/main/java/org/tikv/common/TiSession.java
index c9d1aec0d1c..7e3adbf7a93 100644
--- a/src/main/java/org/tikv/common/TiSession.java
+++ b/src/main/java/org/tikv/common/TiSession.java
@@ -637,6 +637,10 @@ private synchronized void shutdown(boolean now) throws Exception {
       if (metricsServer != null) {
         metricsServer.close();
       }
+
+      if (circuitBreaker != null) {
+        circuitBreaker.close();
+      }
     }
 
     if (now) {
diff --git a/src/main/java/org/tikv/raw/SmartRawKVClient.java b/src/main/java/org/tikv/raw/SmartRawKVClient.java
index 2c00b388e0d..fcca8945137 100644
--- a/src/main/java/org/tikv/raw/SmartRawKVClient.java
+++ b/src/main/java/org/tikv/raw/SmartRawKVClient.java
@@ -258,7 +258,6 @@ private void callWithCircuitBreaker(String funcName, Function0 func) {
 
   @Override
   public void close() throws Exception {
-    circuitBreaker.close();
     client.close();
   }