diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/ChatRoomDao.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/ChatRoomDao.kt
index 98873cdd..31958ce9 100644
--- a/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/ChatRoomDao.kt
+++ b/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/ChatRoomDao.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface ChatRoomDao {
     @Transaction
-    @Query("SELECT * FROM ChatRoom WHERE id = :id")
+    @Query("SELECT * FROM ChatRoom WHERE id = :id AND deletedAt IS NULL")
     fun findChatRoomById(id: String): LocalChatRoom?
 
     @Transaction