diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java
index 13aff766..33680dee 100644
--- a/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -137,7 +137,7 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 		environment.servlets().addServlet("analytics.js", injector.getInstance(AnalyticsServlet.class)).addMapping("/analytics.js");
 
 		// Scheduled tasks
-		ScheduledExecutorService executor = environment.lifecycle().scheduledExecutorService("task-scheduler").build();
+		ScheduledExecutorService executor = environment.lifecycle().scheduledExecutorService("task-scheduler", true).build();
 		injector.getInstance(OldStatusesCleanupTask.class).register(executor);
 		injector.getInstance(OrphansCleanupTask.class).register(executor);