diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/ClientVersioningManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/ClientVersioningManagerImpl.java
index 5f51690a37d9d2a5bb4797f5d3ec5d8d4645b7ed..0e9d7998926a91f9260853cadb34beb97c690814 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/sync/ClientVersioningManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/ClientVersioningManagerImpl.java
@@ -96,6 +96,9 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
 		try {
 			Contact contact = db.getContact(txn, contactId);
 			Group g = getContactGroup(contact);
+			// Contact may be in the process of being added or removed, so
+			// contact group may not exist
+			if (!db.containsGroup(txn, g.getId())) return INVISIBLE;
 			LatestUpdates latest = findLatestUpdates(txn, g.getId());
 			if (latest.local == null) throw new DbException();
 			if (latest.remote == null) return INVISIBLE;