diff --git a/src/keycache.ts b/src/keycache.ts
index 4d72e82..56bb013 100644
--- a/src/keycache.ts
+++ b/src/keycache.ts
@@ -7,8 +7,7 @@ import PeerId from "peer-id";
 class Keycache {
   private storage = new Map<bytes, bytes32>();
 
-  public store(peerId?: PeerId, key: bytes32): void {
-    if(!peerId) return;
+  public store(peerId: PeerId, key: bytes32): void {
     this.storage.set(peerId.id, key);
   }
 
diff --git a/src/noise.ts b/src/noise.ts
index 04b29fe..eb7dc14 100644
--- a/src/noise.ts
+++ b/src/noise.ts
@@ -181,7 +181,7 @@ export class Noise implements INoiseConnection {
       await handshake.exchange();
       await handshake.finish();
 
-      if (this.useNoisePipes) {
+      if (this.useNoisePipes && remotePeer) {
         KeyCache.store(remotePeer, handshake.getRemoteStaticKey());
       }
     } catch (e) {