diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java
index 1149ca377..08fc1b0a0 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java
@@ -73,13 +73,15 @@ public class DynamicConfigurationManager {
     }
 
     new Thread(() -> {
-      try {
-        retrieveDynamicConfiguration().ifPresent(configuration::set);
-      } catch (Throwable t) {
-        logger.warn("Error retrieving dynamic configuration", t);
-      }
+      while (true) {
+        try {
+          retrieveDynamicConfiguration().ifPresent(configuration::set);
+        } catch (Throwable t) {
+          logger.warn("Error retrieving dynamic configuration", t);
+        }
 
-      Util.sleep(5000);
+        Util.sleep(5000);
+      }
     }).start();
   }