diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/Cdn3StorageManagerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/Cdn3StorageManagerConfiguration.java
index 9ecc383a7..64cc5f4bd 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/Cdn3StorageManagerConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/Cdn3StorageManagerConfiguration.java
@@ -2,6 +2,7 @@ package org.whispersystems.textsecuregcm.configuration;
 
 import java.util.Collections;
 import java.util.Map;
+import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import org.whispersystems.textsecuregcm.configuration.secrets.SecretString;
 
@@ -24,8 +25,8 @@ public record Cdn3StorageManagerConfiguration(
     @NotNull SecretString clientSecret,
     @NotNull Map<Integer, String> sourceSchemes,
     @NotNull Integer numHttpClients,
-    @NotNull CircuitBreakerConfiguration circuitBreaker,
-    @NotNull RetryConfiguration retry) {
+    @NotNull @Valid CircuitBreakerConfiguration circuitBreaker,
+    @NotNull @Valid RetryConfiguration retry) {
 
   public Cdn3StorageManagerConfiguration {
     if (numHttpClients == null) {
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/ClientCdnConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/ClientCdnConfiguration.java
index 541c74bc2..224855667 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/ClientCdnConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/ClientCdnConfiguration.java
@@ -1,6 +1,7 @@
 package org.whispersystems.textsecuregcm.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -15,10 +16,12 @@ public class ClientCdnConfiguration {
 
   @JsonProperty
   @NotNull
+  @Valid
   CircuitBreakerConfiguration circuitBreaker = new CircuitBreakerConfiguration();
 
   @JsonProperty
   @NotNull
+  @Valid
   RetryConfiguration retry = new RetryConfiguration();
 
   public CircuitBreakerConfiguration getCircuitBreaker() {
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/HCaptchaConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/HCaptchaConfiguration.java
index c2cf34b79..31a311a7c 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/HCaptchaConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/HCaptchaConfiguration.java
@@ -6,6 +6,7 @@
 package org.whispersystems.textsecuregcm.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import org.whispersystems.textsecuregcm.captcha.HCaptchaClient;
@@ -24,10 +25,12 @@ public class HCaptchaConfiguration implements HCaptchaClientFactory {
 
   @JsonProperty
   @NotNull
+  @Valid
   CircuitBreakerConfiguration circuitBreaker = new CircuitBreakerConfiguration();
 
   @JsonProperty
   @NotNull
+  @Valid
   RetryConfiguration retry = new RetryConfiguration();