diff --git a/CHANGELOG.md b/CHANGELOG.md
index 778efeadf..7a8fd447e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr
 
 ### Fixed
 - Ensure matchmaker stats behave correctly if matchmaker becomes fully empty and idle.
+- Correctly clear rank cache entries on account deletion.
 
 ## [3.23.0] - 2024-07-27
 ### Added
diff --git a/server/core_leaderboard.go b/server/core_leaderboard.go
index 32744fb67..da14828f4 100644
--- a/server/core_leaderboard.go
+++ b/server/core_leaderboard.go
@@ -636,7 +636,7 @@ func LeaderboardRecordsDeleteAll(ctx context.Context, logger *zap.Logger, leader
 		}
 
 		expiryUnix := expiryTime.Time.Unix()
-		if expiryUnix <= currentTime {
+		if expiryUnix != 0 && expiryUnix <= currentTime {
 			// Expired ranks are handled by the rank cache itself.
 			continue
 		}