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 a66ef5b8d..da381cf60 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
@@ -163,6 +163,7 @@ class CleanupManagerImpl implements CleanupManager, Service, EventListener {
 				messageIds.add(m);
 			} else {
 				LOG.info("Message was not deleted");
+				db.stopCleanupTimer(txn, m);
 			}
 		}
 		for (Entry<GroupId, Collection<MessageId>> e : deleted.entrySet()) {