diff --git a/router/java/src/net/i2p/router/transport/udp/PeerStateDestroyed.java b/router/java/src/net/i2p/router/transport/udp/PeerStateDestroyed.java
index 61452e230..87365fc3f 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerStateDestroyed.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerStateDestroyed.java
@@ -94,11 +94,13 @@ class PeerStateDestroyed implements SSU2Payload.PayloadCallback, SSU2Sender {
     }
 
     /**
-     *  Call at transport shutdown
+     *  Call at transport shutdown or cache eviction
      */
     public void kill() {
         _ackTimer.cancel();
         _killTimer.cancel();
+        _sendCha.destroy();
+        _rcvCha.destroy();
     }
 
     /// begin SSU2Sender interface ///
@@ -358,6 +360,8 @@ class PeerStateDestroyed implements SSU2Payload.PayloadCallback, SSU2Sender {
                 _log.debug("Done listening for " + PeerStateDestroyed.this);
             _ackTimer.cancel();
             _transport.removeRecentlyClosed(PeerStateDestroyed.this);
+            _sendCha.destroy();
+            _rcvCha.destroy();
         }
     }