diff --git a/framework/src/main/java/org/tron/core/net/peer/PeerConnection.java b/framework/src/main/java/org/tron/core/net/peer/PeerConnection.java
index 6743f00421d..4fac50b82c7 100644
--- a/framework/src/main/java/org/tron/core/net/peer/PeerConnection.java
+++ b/framework/src/main/java/org/tron/core/net/peer/PeerConnection.java
@@ -197,10 +197,10 @@ public void onConnect() {
   public void onDisconnect() {
     syncService.onDisconnect(this);
     advService.onDisconnect(this);
-    advInvReceive.cleanUp();
-    advInvSpread.cleanUp();
+    advInvReceive.invalidateAll();
+    advInvSpread.invalidateAll();
     advInvRequest.clear();
-    syncBlockIdCache.cleanUp();
+    syncBlockIdCache.invalidateAll();
     syncBlockToFetch.clear();
     syncBlockRequested.clear();
     syncBlockInProcess.clear();
diff --git a/framework/src/test/java/org/tron/core/net/peer/PeerConnectionTest.java b/framework/src/test/java/org/tron/core/net/peer/PeerConnectionTest.java
index c0d81ca2763..9db5230ed45 100644
--- a/framework/src/test/java/org/tron/core/net/peer/PeerConnectionTest.java
+++ b/framework/src/test/java/org/tron/core/net/peer/PeerConnectionTest.java
@@ -60,9 +60,9 @@ public void testOnDisconnect() {
 
     peerConnection.onDisconnect();
 
-    //Assert.assertEquals(0, peerConnection.getAdvInvReceive().size());
-    //Assert.assertEquals(0, peerConnection.getAdvInvSpread().size());
-    //Assert.assertEquals(0, peerConnection.getSyncBlockIdCache().size());
+    Assert.assertEquals(0, peerConnection.getAdvInvReceive().size());
+    Assert.assertEquals(0, peerConnection.getAdvInvSpread().size());
+    Assert.assertEquals(0, peerConnection.getSyncBlockIdCache().size());
     Assert.assertEquals(0, peerConnection.getSyncBlockToFetch().size());
     Assert.assertEquals(0, peerConnection.getSyncBlockRequested().size());
     Assert.assertEquals(0, peerConnection.getSyncBlockInProcess().size());