diff --git a/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go
index 7b6c0cfe2c..afcbf95661 100644
--- a/p2p/protocol/identify/id.go
+++ b/p2p/protocol/identify/id.go
@@ -190,18 +190,12 @@ func (ids *IDService) loop() {
 		case addReq := <-ids.addPeerHandlerCh:
 			rp := addReq.rp
 			ph, ok := phs[rp]
-			if ok {
-				addReq.resp <- ph
-				continue
-			}
-
-			if ids.Host.Network().Connectedness(rp) == network.Connected {
+			if !ok && ids.Host.Network().Connectedness(rp) == network.Connected {
 				ph = newPeerHandler(rp, ids)
 				ph.start()
 				phs[rp] = ph
-				addReq.resp <- ph
 			}
-
+			addReq.resp <- ph
 		case rmReq := <-ids.rmPeerHandlerCh:
 			rp := rmReq.p
 			if ids.Host.Network().Connectedness(rp) != network.Connected {
@@ -397,6 +391,12 @@ func (ids *IDService) sendIdentifyResp(s network.Stream) {
 		return
 	}
 
+	if ph == nil {
+		// Peer disconnected, abort.
+		s.Reset()
+		return
+	}
+
 	ph.snapshotMu.RLock()
 	mes := &pb.Identify{}
 	ids.populateMessage(mes, c, ph.snapshot)
diff --git a/p2p/protocol/identify/id_glass_test.go b/p2p/protocol/identify/id_glass_test.go
new file mode 100644
index 0000000000..87fe8aac5a
--- /dev/null
+++ b/p2p/protocol/identify/id_glass_test.go
@@ -0,0 +1,70 @@
+package identify
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/libp2p/go-libp2p-core/network"
+	"github.com/libp2p/go-libp2p-core/peer"
+
+	blhost "github.com/libp2p/go-libp2p-blankhost"
+	swarmt "github.com/libp2p/go-libp2p-swarm/testing"
+)
+
+func TestFastDisconnect(t *testing.T) {
+	// This test checks to see if we correctly abort sending an identify
+	// response if the peer disconnects before we handle the request.
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	target := blhost.NewBlankHost(swarmt.GenSwarm(t, ctx))
+	defer target.Close()
+	ids := NewIDService(target)
+	defer ids.Close()
+
+	sync := make(chan struct{})
+	target.SetStreamHandler(ID, func(s network.Stream) {
+		// Wait till the stream is setup on both sides.
+		<-sync
+
+		// Kill the connection, and make sure we're completely disconnected.
+		s.Conn().Close()
+		for target.Network().Connectedness(s.Conn().RemotePeer()) == network.Connected {
+			// wait till we're disconnected.
+		}
+		// Now try to handle the response.
+		// This should not block indefinitely, or panic, or anything like that.
+		//
+		// However, if we have a bug, that _could_ happen.
+		ids.sendIdentifyResp(s)
+
+		// Ok, allow the outer test to continue.
+		<-sync
+	})
+
+	source := blhost.NewBlankHost(swarmt.GenSwarm(t, ctx))
+	defer source.Close()
+
+	err := source.Connect(ctx, peer.AddrInfo{ID: target.ID(), Addrs: target.Addrs()})
+	if err != nil {
+		t.Fatal(err)
+	}
+	s, err := source.NewStream(ctx, target.ID(), ID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	select {
+	case sync <- struct{}{}:
+	case <-ctx.Done():
+	}
+	s.Reset()
+	select {
+	case sync <- struct{}{}:
+	case <-ctx.Done():
+	}
+	// Make sure we didn't timeout anywhere.
+	if ctx.Err() != nil {
+		t.Fatal(ctx.Err())
+	}
+}