diff --git a/Config/AppConfiguration.swift b/Config/AppConfiguration.swift
index 203edc89c..232b69e68 100644
--- a/Config/AppConfiguration.swift
+++ b/Config/AppConfiguration.swift
@@ -58,6 +58,9 @@ class AppConfiguration: CommonConfiguration {
         
         // bwi: #4941 deactivate voice broadcast
         RiotSettings.shared.enableVoiceBroadcast = BWIBuildSettings.shared.enableFeatureVoiceBroadcastsByDefault
+        
+        // bwi: #5506 activate use latest avatar
+        RiotSettings.shared.roomScreenUseOnlyLatestUserAvatarAndName = BWIBuildSettings.shared.enableRoomScreenUseOnlyLatestUserAvatarAndNameByDefault
     }
     
     
diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift
index a744821a5..7222f0ec5 100644
--- a/Config/BWIBuildSettings.swift
+++ b/Config/BWIBuildSettings.swift
@@ -545,7 +545,7 @@ class BWIBuildSettings: NSObject {
     var bwiShowTimelineSettings = false
     
     // #5506 alway use the latest avatar for data privacy
-    var roomScreenUseOnlyLatestUserAvatarAndName = true
+    var enableRoomScreenUseOnlyLatestUserAvatarAndNameByDefault = true
     
     // MARK BWI personal state
     var bwiPersonalState = false
diff --git a/Riot/Managers/Settings/RiotSettings.swift b/Riot/Managers/Settings/RiotSettings.swift
index 9d28077a1..d3561eb98 100644
--- a/Riot/Managers/Settings/RiotSettings.swift
+++ b/Riot/Managers/Settings/RiotSettings.swift
@@ -296,7 +296,7 @@ final class RiotSettings: NSObject {
     /// Note: this is set up from Room perspective, which means that if a user updates their profile after
     /// leaving a Room, it will show up the latest profile used in the Room rather than the latest overall.
     // bwi: #5506 alway use the latest avatar
-    @UserDefault(key: "roomScreenUseOnlyLatestUserAvatarAndName", defaultValue: BWIBuildSettings.shared.roomScreenUseOnlyLatestUserAvatarAndName, storage: defaults)
+    @UserDefault(key: "roomScreenUseOnlyLatestUserAvatarAndName", defaultValue: BWIBuildSettings.shared.enableRoomScreenUseOnlyLatestUserAvatarAndNameByDefault, storage: defaults)
     var roomScreenUseOnlyLatestUserAvatarAndName
     
     // MARK: - Room Contextual Menu