diff --git a/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java
index da381cf60..12bc4e00b 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java
@@ -95,15 +95,12 @@ class CleanupManagerImpl implements CleanupManager, Service, EventListener {
 
 	private void maybeScheduleTask(long deadline) {
 		synchronized (lock) {
-			long minDeadline = Long.MAX_VALUE;
 			for (CleanupTask task : pending) {
-				if (task.deadline < minDeadline) minDeadline = task.deadline;
-			}
-			if (deadline < minDeadline) {
-				CleanupTask task = new CleanupTask(deadline);
-				pending.add(task);
-				scheduleTask(task);
+				if (task.deadline <= deadline) return;
 			}
+			CleanupTask task = new CleanupTask(deadline);
+			pending.add(task);
+			scheduleTask(task);
 		}
 	}