diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
index dea017b4d..400a2a06f 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
@@ -317,12 +317,12 @@ public class WhisperServerConfiguration extends Configuration {
 
   @Valid
   @JsonProperty
-  // TODO: Mark as @NotNull when enabled for production.
+  @NotNull
   private SubscriptionConfiguration subscription;
 
   @Valid
   @JsonProperty
-  // TODO: Mark as @NotNull when enabled for production.
+  @NotNull
   private BoostConfiguration boost;
 
   @Valid