diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt
index 646be4ff25..7e9d7f0181 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt
@@ -61,14 +61,16 @@ fun PreferenceCheckbox(
                 color = enabled.toEnabledColor(),
             )
         },
-        supportingContent = {
-            if (supportingText != null) {
+        supportingContent = if (supportingText != null) {
+            {
                 Text(
                     style = ElementTheme.typography.fontBodyMdRegular,
                     text = supportingText,
                     color = enabled.toSecondaryEnabledColor(),
                 )
             }
+        } else {
+            null
         },
         trailingContent = ListItemContent.Checkbox(
             checked = isChecked,