diff --git a/gossip_tracer.go b/gossip_tracer.go
index 9ee9a24b..04e77193 100644
--- a/gossip_tracer.go
+++ b/gossip_tracer.go
@@ -118,17 +118,24 @@ var _ RawTracer = (*gossipTracer)(nil)
 
 func (gt *gossipTracer) fulfillPromise(msg *Message) {
 	mid := gt.msgID(msg.Message)
-	p := msg.ReceivedFrom
 
 	gt.Lock()
 	defer gt.Unlock()
 
+	promises, ok := gt.promises[mid]
+	if !ok {
+		return
+	}
 	delete(gt.promises, mid)
-	peerPromises, ok := gt.peerPromises[p]
-	if ok {
-		delete(peerPromises, mid)
-		if len(peerPromises) == 0 {
-			delete(gt.peerPromises, p)
+
+	// delete the promise for all peers that promised it, as they have no way to fulfill it.
+	for p := range promises {
+		peerPromises, ok := gt.peerPromises[p]
+		if ok {
+			delete(peerPromises, mid)
+			if len(peerPromises) == 0 {
+				delete(gt.peerPromises, p)
+			}
 		}
 	}
 }
diff --git a/gossip_tracer_test.go b/gossip_tracer_test.go
index 787e753d..87dcece8 100644
--- a/gossip_tracer_test.go
+++ b/gossip_tracer_test.go
@@ -40,7 +40,7 @@ func TestBrokenPromises(t *testing.T) {
 	gt.ThrottlePeer(peerC)
 
 	// make promises break
-	time.Sleep(GossipSubIWantFollowupTime + 10*time.Millisecond)
+	time.Sleep(gt.followUpTime + time.Millisecond)
 
 	brokenPromises = gt.GetBrokenPromises()
 	if len(brokenPromises) != 2 {
@@ -56,17 +56,17 @@ func TestBrokenPromises(t *testing.T) {
 	if brokenPromisesB != 1 {
 		t.Fatalf("expected 1 broken promise from A, got %d", brokenPromisesB)
 	}
+
+	// verify that the peerPromises map has been vacated
+	if len(gt.peerPromises) != 0 {
+		t.Fatal("expected empty peerPromises map")
+	}
 }
 
 func TestNoBrokenPromises(t *testing.T) {
 	// like above, but this time we deliver messages to fullfil the promises
-	originalGossipSubIWantFollowupTime := GossipSubIWantFollowupTime
-	GossipSubIWantFollowupTime = 100 * time.Millisecond
-	defer func() {
-		GossipSubIWantFollowupTime = originalGossipSubIWantFollowupTime
-	}()
-
 	gt := newGossipTracer()
+	gt.followUpTime = 100 * time.Millisecond
 
 	peerA := peer.ID("A")
 	peerB := peer.ID("B")
@@ -88,11 +88,16 @@ func TestNoBrokenPromises(t *testing.T) {
 		gt.DeliverMessage(&Message{Message: m})
 	}
 
-	time.Sleep(GossipSubIWantFollowupTime + 10*time.Millisecond)
+	time.Sleep(gt.followUpTime + time.Millisecond)
 
 	// there should be no broken promises
 	brokenPromises := gt.GetBrokenPromises()
 	if brokenPromises != nil {
 		t.Fatal("expected no broken promises")
 	}
+
+	// verify that the peerPromises map has been vacated
+	if len(gt.peerPromises) != 0 {
+		t.Fatal("expected empty peerPromises map")
+	}
 }