diff --git a/irc/server.go b/irc/server.go
index 24b48094..bda37fa9 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -913,12 +913,14 @@ func (server *Server) GetHistorySequence(providedChannel *Channel, client *Clien
 	}
 	if config.History.Restrictions.EnforceRegistrationDate {
 		regCutoff := client.historyCutoff()
-		regCutoff.Add(-time.Duration(config.History.Restrictions.GracePeriod))
-		// take the earlier of the two cutoffs
+		// take the later of the two cutoffs
 		if regCutoff.After(cutoff) {
 			cutoff = regCutoff
 		}
 	}
+	if !cutoff.IsZero() {
+		cutoff = cutoff.Add(-time.Duration(config.History.Restrictions.GracePeriod))
+	}
 	if hist != nil {
 		sequence = hist.MakeSequence(recipient, cutoff)
 	} else if recipient != "" {