diff --git a/java/google/registry/monitoring/whitebox/StackdriverModule.java b/java/google/registry/monitoring/whitebox/StackdriverModule.java
index 4fc2ef199..fbb045d88 100644
--- a/java/google/registry/monitoring/whitebox/StackdriverModule.java
+++ b/java/google/registry/monitoring/whitebox/StackdriverModule.java
@@ -24,6 +24,7 @@ import com.google.appengine.api.ThreadManager;
 import com.google.appengine.api.modules.ModulesService;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import dagger.Module;
 import dagger.Provides;
 import google.registry.config.RegistryConfig.Config;
@@ -87,7 +88,10 @@ public final class StackdriverModule {
   @Provides
   @Named("metricsBackgroundThreadFactory")
   static ThreadFactory provideThreadFactory() {
-    return ThreadManager.backgroundThreadFactory();
+    return new ThreadFactoryBuilder()
+        .setThreadFactory(ThreadManager.backgroundThreadFactory())
+        .setDaemon(true)
+        .build();
   }
 
   @Provides