diff --git a/interweb-server/src/main/java/de/l3s/interweb/server/features/chat/Chat.java b/interweb-server/src/main/java/de/l3s/interweb/server/features/chat/Chat.java
index 032db80b..0b96a1df 100644
--- a/interweb-server/src/main/java/de/l3s/interweb/server/features/chat/Chat.java
+++ b/interweb-server/src/main/java/de/l3s/interweb/server/features/chat/Chat.java
@@ -94,9 +94,7 @@ public static Uni<List<Chat>> listByUser(Token token, String user, String order,
         Parameters params = Parameters.with("id", token.id);
         Sort sort = PanacheUtils.createSort(order);
 
-        if (user == null) {
-            query += " AND user IS NULL";
-        } else {
+        if (user != null) {
             params.and("user", user);
             query += " AND user = :user";
         }