diff --git a/CHANGELOG.md b/CHANGELOG.md
index a018e7c29c189ade25f494734db7ee50091dc8bb..449dd07d5a9b621f598f087d59b790e03b995de3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr
 - Improve extraction of purchases and subscriptions from Apple receipts.
 - Improve signature of JavaScript runtime Base64 decode functions.
 - Improve signature of JavaScript runtime Base16 encode and decode functions.
+- Token and credential inputs on unlink operations are now optional.
 
 ### Fixed
 - Graceful handling of storage list errors in JavaScript runtime.
diff --git a/server/leaderboard_rank_cache.go b/server/leaderboard_rank_cache.go
index f394b988dc0b231ac78ed817b8519f31db52ddef..6a9f9abaa53d659591b77fdc639b8897956dda1b 100644
--- a/server/leaderboard_rank_cache.go
+++ b/server/leaderboard_rank_cache.go
@@ -177,12 +177,12 @@ func NewLocalLeaderboardRankCache(ctx context.Context, startupLogger *zap.Logger
 
 				rows, err := db.QueryContext(ctx, query, params...)
 				if err != nil {
-					startupLogger.Error("Failed to caching leaderboard ranks", zap.String("leaderboard_id", leaderboard.Id), zap.Error(err))
+					startupLogger.Error("Failed to cache leaderboard ranks", zap.String("leaderboard_id", leaderboard.Id), zap.Error(err))
 					if err == context.Canceled {
-						return // all further attempts will be failing, no point in trying them
-					} else {
-						break
+						// All further queries will fail, no need to continue looping through leaderboards.
+						return
 					}
+					break
 				}
 
 				// Read score information.