diff --git a/src/main/java/org/tikv/common/util/ChannelFactory.java b/src/main/java/org/tikv/common/util/ChannelFactory.java
index 77fd2fefc6..effda5cf46 100644
--- a/src/main/java/org/tikv/common/util/ChannelFactory.java
+++ b/src/main/java/org/tikv/common/util/ChannelFactory.java
@@ -363,11 +363,12 @@ public class ChannelFactory implements AutoCloseable {
     }
     connPool.clear();
 
-    if (certContext != null) {
-      recycler.shutdownNow();
-      if (certWatcher != null) {
-        certWatcher.close();
-      }
+    if (recycler != null) {
+      recycler.shutdown();
+    }
+
+    if (certWatcher != null) {
+      certWatcher.close();
     }
   }
 }