diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
index 3333ffd46..5a886c816 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
@@ -379,7 +379,7 @@ class OfflineFirstChatRepository @Inject constructor(
         }
 
         // remove all temp messages from UI
-        val oldTempMessages = chatDao.getTempMessagesForConversation(internalConversationId, threadId)
+        val oldTempMessages = chatDao.getTempMessagesForConversation(internalConversationId)
             .first()
             .map(ChatMessageEntity::asModel)
         oldTempMessages.forEach {
@@ -403,7 +403,7 @@ class OfflineFirstChatRepository @Inject constructor(
         )
 
         // add the remaining temp messages to UI again
-        val remainingTempMessages = chatDao.getTempMessagesForConversation(internalConversationId, threadId)
+        val remainingTempMessages = chatDao.getTempMessagesForConversation(internalConversationId)
             .first()
             .sortedBy { it.internalId }
             .map(ChatMessageEntity::asModel)
diff --git a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt
index 961659472..5e0e87f3b 100644
--- a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt
+++ b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt
@@ -49,11 +49,10 @@ interface ChatMessagesDao {
         FROM ChatMessages
         WHERE internalConversationId = :internalConversationId
         AND isTemporary = 1
-        AND (:threadId IS NULL OR threadId = :threadId)
         ORDER BY timestamp DESC, id DESC
         """
     )
-    fun getTempMessagesForConversation(internalConversationId: String, threadId: Long?): Flow<List<ChatMessageEntity>>
+    fun getTempMessagesForConversation(internalConversationId: String): Flow<List<ChatMessageEntity>>
 
     @Query(
         """
diff --git a/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt b/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt
index a68e63d2b..eba7dcd33 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt
@@ -31,8 +31,7 @@ class DummyChatMessagesDaoImpl : ChatMessagesDao {
     override fun getMessagesForConversation(internalConversationId: String): Flow<List<ChatMessageEntity>> = flowOf()
 
     override fun getTempMessagesForConversation(
-        internalConversationId: String,
-        threadId: Long?
+        internalConversationId: String
     ): Flow<List<ChatMessageEntity>> = flowOf()
 
     override fun getTempUnsentMessagesForConversation(