diff --git a/java/google/registry/model/domain/token/AllocationToken.java b/java/google/registry/model/domain/token/AllocationToken.java
index aa783b918..cc82cb6fb 100644
--- a/java/google/registry/model/domain/token/AllocationToken.java
+++ b/java/google/registry/model/domain/token/AllocationToken.java
@@ -41,7 +41,7 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
   @Id String token;
 
   /** The key of the history entry for which the token was used. Null if not yet used. */
-  Key<HistoryEntry> redemptionHistoryEntry;
+  @Nullable @Index Key<HistoryEntry> redemptionHistoryEntry;
 
   /** The fully-qualified domain name that this token is limited to, if any. */
   @Nullable @Index String domainName;
diff --git a/javatests/google/registry/model/domain/token/AllocationTokenTest.java b/javatests/google/registry/model/domain/token/AllocationTokenTest.java
index 4395dcc68..ea4abcb79 100644
--- a/javatests/google/registry/model/domain/token/AllocationTokenTest.java
+++ b/javatests/google/registry/model/domain/token/AllocationTokenTest.java
@@ -48,10 +48,12 @@ public class AllocationTokenTest extends EntityTestCase {
         persistResource(
             new AllocationToken.Builder()
                 .setToken("abc123")
+                .setRedemptionHistoryEntry(Key.create(HistoryEntry.class, 1L))
                 .setDomainName("blahdomain.fake")
                 .setCreationTimeForTest(DateTime.parse("2010-11-12T05:00:00Z"))
                 .build()),
         "token",
+        "redemptionHistoryEntry",
         "domainName");
   }