diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
index df94ba264..f43da9e82 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
@@ -430,8 +430,10 @@ class MessageActionsDialog(
     private fun initMenuOpenThread(visible: Boolean) {
         if (visible) {
             dialogMessageActionsBinding.menuOpenThread.setOnClickListener {
-                chatActivity.openThread(message.jsonMessageId.toLong())
-                dismiss()
+                message.threadId?.let {
+                    chatActivity.openThread(it)
+                    dismiss()
+                }
             }
         }
 
diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt
index 80b310de1..ad893cc34 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt
@@ -529,7 +529,7 @@ object ApiUtils {
     fun getUrlForProfile(baseUrl: String, userId: String): String = "$baseUrl$OCS_API_VERSION/profile/$userId"
 
     fun getUrlForThreads(version: Int, baseUrl: String?, token: String): String =
-        getUrlForApi(version, baseUrl) + "/chat/" + token + "/threads"
+        getUrlForChat(version, baseUrl, token) + "/threads"
 
     fun getUrlForThread(version: Int, baseUrl: String?, token: String, threadId: Int): String =
         getUrlForThreads(version, baseUrl, token) + "/$threadId"