diff --git a/briar-core/src/org/briarproject/db/JdbcDatabase.java b/briar-core/src/org/briarproject/db/JdbcDatabase.java
index d8624dc56c4a3499274afb828a49045a97da881e..5fb6436c5f33b3dd9c3c08bafda0c1391957d953 100644
--- a/briar-core/src/org/briarproject/db/JdbcDatabase.java
+++ b/briar-core/src/org/briarproject/db/JdbcDatabase.java
@@ -3027,7 +3027,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 			// Unset any existing inbox group for the contact
 			String sql = "UPDATE groupVisibilities"
 					+ " SET inbox = FALSE"
-					+ " WHERE contactId = ?";
+					+ " WHERE contactId = ?"
+					+ " AND inbox = TRUE";
 			ps = txn.prepareStatement(sql);
 			ps.setInt(1, c.getInt());
 			ps.executeUpdate();