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 7e9d7f0181..99c1ba3f6b 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,16 +61,14 @@ fun PreferenceCheckbox(
                 color = enabled.toEnabledColor(),
             )
         },
-        supportingContent = if (supportingText != null) {
+        supportingContent = supportingText?.let {
             {
                 Text(
                     style = ElementTheme.typography.fontBodyMdRegular,
-                    text = supportingText,
+                    text = it,
                     color = enabled.toSecondaryEnabledColor(),
                 )
             }
-        } else {
-            null
         },
         trailingContent = ListItemContent.Checkbox(
             checked = isChecked,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt
index 1a327fea0e..85f1c10b21 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt
@@ -90,16 +90,16 @@ fun PreferenceText(
                     color = tintColor ?: enabled.toSecondaryEnabledColor(),
                 )
             }
-        } else if (subtitleAnnotated != null) {
-            {
-                Text(
-                    style = ElementTheme.typography.fontBodyMdRegular,
-                    text = subtitleAnnotated,
-                    color = tintColor ?: enabled.toSecondaryEnabledColor(),
-                )
-            }
         } else {
-            null
+            subtitleAnnotated?.let {
+                {
+                    Text(
+                        style = ElementTheme.typography.fontBodyMdRegular,
+                        text = it,
+                        color = tintColor ?: enabled.toSecondaryEnabledColor(),
+                    )
+                }
+            }
         },
         trailingContent = if (currentValue != null || loadingCurrentValue || showEndBadge) {
             ListItemContent.Custom {