diff --git a/briar-core/src/net/sf/briar/db/JdbcDatabase.java b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
index db2dc476a..0877effb7 100644
--- a/briar-core/src/net/sf/briar/db/JdbcDatabase.java
+++ b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
@@ -2183,6 +2183,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			String sql = "SELECT groupId, COUNT(*)"
 					+ " FROM messages AS m"
 					+ " WHERE read = FALSE"
+					+ " AND groupId IS NOT NULL"
 					+ " GROUP BY groupId";
 			ps = txn.prepareStatement(sql);
 			rs = ps.executeQuery();