trailingContent and supportingContent should be null if there is nothing to display.

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt

@@ -82,22 +82,27 @@ fun PreferenceText(
                 color = tintColor ?: enabled.toEnabledColor(),
             )
         },
-        supportingContent = {
+        supportingContent = if (subtitle != null) {
-            if (subtitle != null) {
+            {
                 Text(
                     style = ElementTheme.typography.fontBodyMdRegular,
                     text = subtitle,
                     color = tintColor ?: enabled.toSecondaryEnabledColor(),
                 )
+            }
         } else if (subtitleAnnotated != null) {
+            {
                 Text(
                     style = ElementTheme.typography.fontBodyMdRegular,
                     text = subtitleAnnotated,
                     color = tintColor ?: enabled.toSecondaryEnabledColor(),
                 )
             }
+        } else {
+            null
         },
-        trailingContent = ListItemContent.Custom {
+        trailingContent = if (currentValue != null || loadingCurrentValue || showEndBadge) {
+            ListItemContent.Custom {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
@@ -123,7 +128,10 @@ fun PreferenceText(
                         )
                     }
                 }
-        },
+            }
+        } else {
+            null
+        }
     )
 }