diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/DpScale.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/DpScale.kt
index 7a4f5dd172..c6408b662e 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/DpScale.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/DpScale.kt
@@ -52,7 +52,7 @@ fun Dp.applyScaleUp(): Dp = with(LocalDensity.current) {
 
 @Preview
 @Composable
-fun DpScalePreview_0_75f() = WithFontScale(0.75f) {
+internal fun DpScalePreview_0_75f() = WithFontScale(0.75f) {
     ElementPreviewLight {
         val fontSizeInDp = 16.dp
         Column(
@@ -77,7 +77,7 @@ fun DpScalePreview_0_75f() = WithFontScale(0.75f) {
 
 @Preview
 @Composable
-fun DpScalePreview_1_0f() = WithFontScale(1f) {
+internal fun DpScalePreview_1_0f() = WithFontScale(1f) {
     ElementPreviewLight {
         val fontSizeInDp = 16.dp
         Column(
@@ -102,7 +102,7 @@ fun DpScalePreview_1_0f() = WithFontScale(1f) {
 
 @Preview
 @Composable
-fun DpScalePreview_1_5f() = WithFontScale(1.5f) {
+internal fun DpScalePreview_1_5f() = WithFontScale(1.5f) {
     ElementPreviewLight {
         val fontSizeInDp = 16.dp
         Column(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Checkbox.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Checkbox.kt
index a1a854ede1..31c6cc3647 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Checkbox.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Checkbox.kt
@@ -51,13 +51,11 @@ fun Checkbox(
     var indeterminateState by remember { mutableStateOf(indeterminate) }
     androidx.compose.material3.TriStateCheckbox(
         state = if (!checked && indeterminateState) ToggleableState.Indeterminate else ToggleableState(checked),
-        onClick = if (onCheckedChange != null) {
+        onClick = onCheckedChange?.let {
             {
                 indeterminateState = false
                 onCheckedChange(!checked)
             }
-        } else {
-            null
         },
         modifier = modifier,
         enabled = enabled,
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt
index 57aaa7dbfc..06b6b3d3ea 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt
@@ -43,15 +43,16 @@ suspend fun <T : Any> ReceiveTurbine<T>.consumeItemsUntilPredicate(
 ): List<T> {
     val items = ArrayList<T>()
     tryOrNull {
-        while (true) {
+        var foundItemOrFinished = false
+        while (!foundItemOrFinished) {
             when (val event = withTurbineTimeout(timeout) { awaitEvent() }) {
                 is Event.Item<T> -> {
                     items.add(event.value)
                     if (predicate(event.value)) {
-                        break
+                        foundItemOrFinished = true
                     }
                 }
-                else -> break
+                Event.Complete, is Event.Error -> foundItemOrFinished = true
             }
         }
     }