diff --git a/src/main/java/com/commafeed/CommaFeedModule.java b/src/main/java/com/commafeed/CommaFeedModule.java
index 18260e27..9cb83429 100644
--- a/src/main/java/com/commafeed/CommaFeedModule.java
+++ b/src/main/java/com/commafeed/CommaFeedModule.java
@@ -17,7 +17,8 @@ import com.commafeed.backend.favicon.FacebookFaviconFetcher;
 import com.commafeed.backend.favicon.YoutubeFaviconFetcher;
 import com.commafeed.backend.task.OldEntriesCleanupTask;
 import com.commafeed.backend.task.OldStatusesCleanupTask;
-import com.commafeed.backend.task.OrphansCleanupTask;
+import com.commafeed.backend.task.OrphanedContentsCleanupTask;
+import com.commafeed.backend.task.OrphanedFeedsCleanupTask;
 import com.commafeed.backend.task.ScheduledTask;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
@@ -51,6 +52,7 @@ public class CommaFeedModule extends AbstractModule {
 		Multibinder<ScheduledTask> taskMultibinder = Multibinder.newSetBinder(binder(), ScheduledTask.class);
 		taskMultibinder.addBinding().to(OldStatusesCleanupTask.class);
 		taskMultibinder.addBinding().to(OldEntriesCleanupTask.class);
-		taskMultibinder.addBinding().to(OrphansCleanupTask.class);
+		taskMultibinder.addBinding().to(OrphanedFeedsCleanupTask.class);
+		taskMultibinder.addBinding().to(OrphanedContentsCleanupTask.class);
 	}
 }
diff --git a/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java b/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java
index 33a3e9fb..5e7c1564 100644
--- a/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java
+++ b/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java
@@ -28,7 +28,7 @@ public class OldStatusesCleanupTask extends ScheduledTask {
 
 	@Override
 	public long getInitialDelay() {
-		return 15;
+		return 10;
 	}
 
 	@Override
diff --git a/src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java b/src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java
new file mode 100644
index 00000000..def2b9e2
--- /dev/null
+++ b/src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java
@@ -0,0 +1,38 @@
+package com.commafeed.backend.task;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+
+import com.commafeed.backend.service.DatabaseCleaningService;
+
+@RequiredArgsConstructor(onConstructor = @__({ @Inject }))
+@Singleton
+public class OrphanedContentsCleanupTask extends ScheduledTask {
+
+	private final DatabaseCleaningService cleaner;
+
+	@Override
+	public void run() {
+		cleaner.cleanContentsWithoutEntries();
+	}
+
+	@Override
+	public long getInitialDelay() {
+		return 20;
+	}
+
+	@Override
+	public long getPeriod() {
+		return 60;
+	}
+
+	@Override
+	public TimeUnit getTimeUnit() {
+		return TimeUnit.MINUTES;
+	}
+
+}
diff --git a/src/main/java/com/commafeed/backend/task/OrphansCleanupTask.java b/src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java
similarity index 80%
rename from src/main/java/com/commafeed/backend/task/OrphansCleanupTask.java
rename to src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java
index 6c11ec36..e8bff72d 100644
--- a/src/main/java/com/commafeed/backend/task/OrphansCleanupTask.java
+++ b/src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java
@@ -11,19 +11,18 @@ import com.commafeed.backend.service.DatabaseCleaningService;
 
 @RequiredArgsConstructor(onConstructor = @__({ @Inject }))
 @Singleton
-public class OrphansCleanupTask extends ScheduledTask {
+public class OrphanedFeedsCleanupTask extends ScheduledTask {
 
 	private final DatabaseCleaningService cleaner;
 
 	@Override
 	public void run() {
 		cleaner.cleanFeedsWithoutSubscriptions();
-		cleaner.cleanContentsWithoutEntries();
 	}
 
 	@Override
 	public long getInitialDelay() {
-		return 10;
+		return 15;
 	}
 
 	@Override