diff --git a/apps/ios/Shared/ContentView.swift b/apps/ios/Shared/ContentView.swift
index 9139523580..26e9e953c6 100644
--- a/apps/ios/Shared/ContentView.swift
+++ b/apps/ios/Shared/ContentView.swift
@@ -76,9 +76,9 @@ struct ContentView: View {
             userAuthorized = true
         } else {
             dismissAllSheets(animated: false) {
+                chatModel.chatId = nil
                 justAuthenticate()
             }
-            chatModel.chatId = nil
         }
     }
 
diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
index e237737f03..019a42fd82 100644
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
@@ -246,7 +246,7 @@ struct ComposeView: View {
                 CameraImageListPicker(images: $chosenImages)
             }
         }
-        .appSheet(isPresented: $showImagePicker) {
+        .sheet(isPresented: $showImagePicker) {
             LibraryImageListPicker(images: $chosenImages, selectionLimit: 10) { itemsSelected in
                 showImagePicker = false
                 if itemsSelected {
diff --git a/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift b/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
index 88c0f52e00..32adf861f3 100644
--- a/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
@@ -82,7 +82,7 @@ struct GroupProfileView: View {
                 CameraImagePicker(image: $chosenImage)
             }
         }
-        .appSheet(isPresented: $showImagePicker) {
+        .sheet(isPresented: $showImagePicker) {
             LibraryImagePicker(image: $chosenImage) {
                 didSelectItem in showImagePicker = false
             }
diff --git a/apps/ios/Shared/Views/NewChat/AddGroupView.swift b/apps/ios/Shared/Views/NewChat/AddGroupView.swift
index 2f1491e77f..ed4e82c0e0 100644
--- a/apps/ios/Shared/Views/NewChat/AddGroupView.swift
+++ b/apps/ios/Shared/Views/NewChat/AddGroupView.swift
@@ -136,7 +136,7 @@ struct AddGroupView: View {
                 CameraImagePicker(image: $chosenImage)
             }
         }
-        .appSheet(isPresented: $showImagePicker) {
+        .sheet(isPresented: $showImagePicker) {
             LibraryImagePicker(image: $chosenImage) {
                 didSelectItem in showImagePicker = false
             }
diff --git a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift
index d93cf81aa9..cdd5f0ce94 100644
--- a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift
+++ b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift
@@ -53,7 +53,7 @@ struct SimpleXInfo: View {
                 .padding(.bottom, 8)
                 .frame(maxWidth: .infinity)
             }
-            .appSheet(isPresented: $showHowItWorks) {
+            .sheet(isPresented: $showHowItWorks) {
                 HowItWorks(onboarding: onboarding)
             }
         }
diff --git a/apps/ios/Shared/Views/UserSettings/SMPServersView.swift b/apps/ios/Shared/Views/UserSettings/SMPServersView.swift
index 42615ed69f..372c5bb34a 100644
--- a/apps/ios/Shared/Views/UserSettings/SMPServersView.swift
+++ b/apps/ios/Shared/Views/UserSettings/SMPServersView.swift
@@ -79,7 +79,7 @@ struct SMPServersView: View {
             Button("Add preset servers", action: addAllPresets)
                 .disabled(hasAllPresets())
         }
-        .appSheet(isPresented: $showScanSMPServer) {
+        .sheet(isPresented: $showScanSMPServer) {
             ScanSMPServer(servers: $servers)
         }
         .alert(item: $alert) { a in
diff --git a/apps/ios/Shared/Views/UserSettings/SettingsButton.swift b/apps/ios/Shared/Views/UserSettings/SettingsButton.swift
index 7e53fe29c7..7292fd4373 100644
--- a/apps/ios/Shared/Views/UserSettings/SettingsButton.swift
+++ b/apps/ios/Shared/Views/UserSettings/SettingsButton.swift
@@ -16,7 +16,7 @@ struct SettingsButton: View {
         Button { showSettings = true } label: {
             Image(systemName: "gearshape")
         }
-        .appSheet(isPresented: $showSettings, content: {
+        .sheet(isPresented: $showSettings, content: {
             SettingsView(showSettings: $showSettings)
         })
     }
diff --git a/apps/ios/Shared/Views/UserSettings/UserProfile.swift b/apps/ios/Shared/Views/UserSettings/UserProfile.swift
index ad275cf4d9..de7a19c8bd 100644
--- a/apps/ios/Shared/Views/UserSettings/UserProfile.swift
+++ b/apps/ios/Shared/Views/UserSettings/UserProfile.swift
@@ -100,7 +100,7 @@ struct UserProfile: View {
                 CameraImagePicker(image: $chosenImage)
             }
         }
-        .appSheet(isPresented: $showImagePicker) {
+        .sheet(isPresented: $showImagePicker) {
             LibraryImagePicker(image: $chosenImage) {
                 didSelectItem in showImagePicker = false
             }