diff --git a/components/net/sf/briar/db/DatabaseCleanerImpl.java b/components/net/sf/briar/db/DatabaseCleanerImpl.java
index 6cf560738..70d424b3b 100644
--- a/components/net/sf/briar/db/DatabaseCleanerImpl.java
+++ b/components/net/sf/briar/db/DatabaseCleanerImpl.java
@@ -29,11 +29,12 @@ class DatabaseCleanerImpl implements DatabaseCleaner, Runnable {
 
 	public void run() {
 		try {
-			while(!stopped.get()) {
+			while(true) {
 				if(callback.shouldCheckFreeSpace()) {
 					callback.checkFreeSpaceAndClean();
 				} else {
 					synchronized(stopped) {
+						if(stopped.get()) break;
 						try {
 							stopped.wait(msBetweenSweeps);
 						} catch(InterruptedException ignored) {}