diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index 177bde83ec..3439bcfced 100644
--- a/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -129,12 +129,13 @@ class UiAllScreensSanityTest {
                 addSpace().also { openMenu(publicSpaceName) }
 
                 leaveSpace()
-                // Some instability with the bottomsheet
-                // not sure what's the source, maybe the expanded state?
-                Thread.sleep(10_000)
             }
         }
 
+        // Some instability with the bottomsheet
+        // not sure what's the source, maybe the expanded state?
+        Thread.sleep(10_000)
+
         elementRobot.space { selectSpace(spaceName) }
 
         elementRobot.layoutPreferences {
@@ -177,7 +178,6 @@ class UiAllScreensSanityTest {
      * Testing multiple threads screens
      */
     private fun testThreadScreens() {
-//        elementRobot.toggleLabFeature(LabFeature.THREAD_MESSAGES)
         elementRobot.newRoom {
             createNewRoom {
                 crawl()
@@ -191,6 +191,5 @@ class UiAllScreensSanityTest {
                 }
             }
         }
-//        elementRobot.toggleLabFeature(LabFeature.THREAD_MESSAGES)
     }
 }