diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
index 55526b41db..3a016bc3e2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
@@ -70,7 +70,8 @@ internal data class Capabilities(
          * Capability to indicate if the server supports MSC3440 Threading
          * True if the user can use m.thread relation, false otherwise
          */
-        @Json(name = "m.thread")
+//        @Json(name = "m.thread")
+        @Json(name = "io.element.thread")
         val threads: BooleanCapability? = null
 )
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
index 290b71a504..d68e0a3248 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
@@ -54,8 +54,7 @@ class ThreadListViewModel @AssistedInject constructor(@Assisted val initialState
     }
 
     init {
-        observeThreads()
-        fetchThreadList()
+        fetchAndObserveThreads()
     }
 
     override fun handle(action: EmptyAction) {}
@@ -64,9 +63,12 @@ class ThreadListViewModel @AssistedInject constructor(@Assisted val initialState
      * Observing thread list with respect to homeserver
      * capabilities
      */
-    private fun observeThreads() {
+    private fun fetchAndObserveThreads() {
         when (session.getHomeServerCapabilities().canUseThreading) {
-            true  -> observeThreadSummaries()
+            true  -> {
+                fetchThreadList()
+                observeThreadSummaries()
+            }
             false -> observeThreadsList()
         }
     }