diff --git a/proxy/src/main/java/google/registry/proxy/quota/TokenStore.java b/proxy/src/main/java/google/registry/proxy/quota/TokenStore.java
index bf7c882d0..f2640ed21 100644
--- a/proxy/src/main/java/google/registry/proxy/quota/TokenStore.java
+++ b/proxy/src/main/java/google/registry/proxy/quota/TokenStore.java
@@ -185,7 +185,7 @@ public class TokenStore {
           if (Duration.between(availableTokens.timestamp(), clock.now())
                   .compareTo(config.getRefreshPeriod())
               >= 0) {
-            tokensMap.remove(user);
+            tokensMap.remove(user, availableTokens);
           }
         });
   }