diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index e4120e8133..e225f61c4f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -145,12 +145,13 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         session.rx()
                 .liveUser(session.myUserId)
                 .unwrap()
-                .distinctUntilChanged { user -> user.displayName }
+                .map { it.displayName ?: "" }
+                .distinctUntilChanged()
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe { user ->
+                .subscribe { displayName ->
                     mDisplayNamePreference.let {
-                        it.summary = user.displayName ?: ""
-                        it.text = user.displayName ?: ""
+                        it.summary = displayName
+                        it.text = displayName
                     }
                 }
                 .disposeOnDestroyView()