diff --git a/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java b/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java
index 620a4730e..0e626c01e 100644
--- a/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java
+++ b/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java
@@ -38,11 +38,10 @@ public final class StaticPremiumListPricingEngine implements PremiumPricingEngin
     String tld = getTldFromDomainName(fullyQualifiedDomainName);
     String label = InternetDomainName.from(fullyQualifiedDomainName).parts().get(0);
     Registry registry = Registry.get(checkNotNull(tld, "tld"));
-    Optional<Money> premiumPrice = Optional.empty();
-    if (registry.getPremiumList().isPresent()) {
-      premiumPrice =
-          PremiumListDao.getPremiumPrice(registry.getPremiumList().get().getName(), label);
-    }
+    Optional<Money> premiumPrice =
+        registry
+            .getPremiumList()
+            .flatMap(listKey -> PremiumListDao.getPremiumPrice(listKey.getName(), label));
     return DomainPrices.create(
         premiumPrice.isPresent(),
         premiumPrice.orElse(registry.getStandardCreateCost()),
diff --git a/core/src/main/java/google/registry/model/registry/Registry.java b/core/src/main/java/google/registry/model/registry/Registry.java
index 8de68fecd..42b886859 100644
--- a/core/src/main/java/google/registry/model/registry/Registry.java
+++ b/core/src/main/java/google/registry/model/registry/Registry.java
@@ -606,7 +606,6 @@ public class Registry extends ImmutableObject implements Buildable, DatastoreAnd
     return anchorTenantAddGracePeriodLength;
   }
 
-  @Nullable
   public Optional<Key<PremiumList>> getPremiumList() {
     return Optional.ofNullable(premiumList);
   }