Richard T. Carback III · Benjamin Wenger · Richard T. Carback III
--- a/broadcast/client.go
+++ b/broadcast/client.go
 	}

 	// Add channel's identity
-	net.AddIdentity(channel.ReceptionID, identity.Forever, true)
+	net.AddIdentityWithHistory(channel.ReceptionID, identity.Forever,
+		time.Now().Add(-500*time.Second), true)
--- a/cmix/identity/tracker.go
+++ b/cmix/identity/tracker.go
 	// DefaultExtraChecks is the default value for ExtraChecks
 	// on receptionID.Identity.
 	DefaultExtraChecks = 10
+
+	NetworkRetention = 500 * time.Hour
--- a/cmix/identity/tracker.go
+++ b/cmix/identity/tracker.go
 		}

 		newIdentity.Ephemeral = !inQuestion.Persistent
-		if err := t.ephemeral.AddIdentity(newIdentity); err != nil {
-			jww.FATAL.Panicf("Could not insert identity: %+v", err)
+
+		// If the identity expired before the current time, we know it
+		// is no longer valid and should be added to the chain
+		if netTime.Now().After(newIdentity.EndValid) {
+			identitiesToChain = append(identitiesToChain, newIdentity)