diff --git a/briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java
index 0d2c514f9..20744b065 100644
--- a/briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java
+++ b/briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java
@@ -612,7 +612,7 @@ public class RemoteWipeManagerImpl extends ConversationClientImpl
 	@Override
 	public boolean remoteWipeIsSetup(Transaction txn) {
 		try {
-			return !db.getGroupMetadata(txn, localGroup.getId()).isEmpty();
+			return getWipers(txn).size() > 0;
 		} catch (DbException e) {
 			return false;
 		}