diff --git a/cmix/identity/tracker.go b/cmix/identity/tracker.go
index b0f7ca587841eead1ea33d32eac09ef36d0e0cc0..2f4494c39c2eca20c63898d0e7d81f9539c84a84 100644
--- a/cmix/identity/tracker.go
+++ b/cmix/identity/tracker.go
@@ -151,6 +151,11 @@ func (t *manager) AddIdentityWithHistory(id *id.ID, validUntil, historicalBeginn
 		historicalBeginning = retention
 	}
 
+	if now := time.Now(); historicalBeginning.After(now) ||
+		now.Sub(historicalBeginning) < 1*time.Minute {
+		historicalBeginning = now.Add(-1 * time.Minute)
+	}
+
 	t.newIdentity <- TrackedID{
 		NextGeneration: netTime.Now().Add(-time.Second),
 		LastGeneration: historicalBeginning,