diff --git a/apps/ios/Shared/Views/ChatList/UserPicker.swift b/apps/ios/Shared/Views/ChatList/UserPicker.swift
index 8b798e2fa3..56f0806875 100644
--- a/apps/ios/Shared/Views/ChatList/UserPicker.swift
+++ b/apps/ios/Shared/Views/ChatList/UserPicker.swift
@@ -137,10 +137,12 @@ struct UserPicker: View {
                 case .chatProfiles:
                     UserProfilesView(showSettings: $showSettings)
                 case .address:
-                    UserAddressView(shareViaProfile: true)
-                        .navigationTitle("SimpleX address")
-                        .navigationBarTitleDisplayMode(.large)
-                        .modifier(ThemedBackground(grouped: true))
+                    if let user = m.currentUser {
+                        UserAddressView(shareViaProfile: user.addressShared)
+                            .navigationTitle("SimpleX address")
+                            .navigationBarTitleDisplayMode(.large)
+                            .modifier(ThemedBackground(grouped: true))
+                    }
                 case .chatPreferences:
                     if let user = m.currentUser {
                         PreferencesView(profile: user.profile, preferences: user.fullPreferences, currentPreferences: user.fullPreferences)