diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
index fcd874d49a..d1cf0bf6a6 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
@@ -47,13 +47,13 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun PreferencesRootView(
     state: PreferencesRootState,
-    modifier: Modifier = Modifier,
     onBackPressed: () -> Unit,
     onVerifyClicked: () -> Unit,
     onOpenAnalytics: () -> Unit,
     onOpenRageShake: () -> Unit,
     onOpenAbout: () -> Unit,
     onOpenDeveloperSettings: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     // Include pref from other modules
     PreferenceView(
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
index 164d91ebff..04ad358aca 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
@@ -46,8 +46,22 @@ fun MatrixUserHeader(
     // onClick: () -> Unit = {},
 ) {
     if (matrixUser == null) {
-        return MatrixUserHeaderPlaceholder(modifier = modifier)
+        MatrixUserHeaderPlaceholder(modifier = modifier)
+    } else {
+        MatrixUserHeaderContent(
+            matrixUser = matrixUser,
+            modifier = modifier,
+            // onClick = onClick
+        )
     }
+}
+
+@Composable
+private fun MatrixUserHeaderContent(
+    matrixUser: MatrixUser,
+    modifier: Modifier = Modifier,
+    // onClick: () -> Unit = {},
+) {
     Row(
         modifier = modifier
             // .clickable(onClick = onClick)