diff --git a/lib/features/push_notification/data/extensions/keychain_sharing_session_extension.dart b/lib/features/push_notification/data/extensions/keychain_sharing_session_extension.dart
index 5b603b070..16bf65852 100644
--- a/lib/features/push_notification/data/extensions/keychain_sharing_session_extension.dart
+++ b/lib/features/push_notification/data/extensions/keychain_sharing_session_extension.dart
@@ -3,14 +3,14 @@ import 'package:tmail_ui_user/features/push_notification/data/keychain/keychain_
 
 extension KeychainSharingSessionExtension on KeychainSharingSession {
 
-  KeychainSharingSession updating({String? emailState, String? emailDeliveryState}) {
+  KeychainSharingSession updating({String? emailState}) {
     return KeychainSharingSession(
       accountId: accountId,
       userName: userName,
       authenticationType: authenticationType,
       apiUrl: apiUrl,
       emailState: emailState ?? emailState,
-      emailDeliveryState: emailDeliveryState ?? emailDeliveryState,
+      emailDeliveryState: emailDeliveryState,
       tokenOIDC: tokenOIDC,
       basicAuth: basicAuth,
       tokenEndpoint: tokenEndpoint,
diff --git a/lib/features/push_notification/presentation/listener/email_change_listener.dart b/lib/features/push_notification/presentation/listener/email_change_listener.dart
index a929e93ec..b41c1b57a 100644
--- a/lib/features/push_notification/presentation/listener/email_change_listener.dart
+++ b/lib/features/push_notification/presentation/listener/email_change_listener.dart
@@ -47,7 +47,6 @@ import 'package:tmail_ui_user/features/push_notification/presentation/listener/c
 import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart';
 import 'package:tmail_ui_user/features/thread/domain/constants/thread_constants.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
-import 'package:tmail_ui_user/main/utils/ios_sharing_manager.dart';
 
 class EmailChangeListener extends ChangeListener {
 
@@ -63,7 +62,6 @@ class EmailChangeListener extends ChangeListener {
   GetListDetailedEmailByIdInteractor? _getListDetailedEmailByIdInteractor;
   DynamicUrlInterceptors? _dynamicUrlInterceptors;
   StoreListNewEmailInteractor? _storeListNewEmailInteractor;
-  IOSSharingManager? _iosSharingManager;
 
   jmap.State? _newStateEmailDelivery;
   AccountId? _accountId;
@@ -85,7 +83,6 @@ class EmailChangeListener extends ChangeListener {
       _getListDetailedEmailByIdInteractor = getBinding<GetListDetailedEmailByIdInteractor>();
       _dynamicUrlInterceptors = getBinding<DynamicUrlInterceptors>();
       _storeListNewEmailInteractor = getBinding<StoreListNewEmailInteractor>();
-      _iosSharingManager = getBinding<IOSSharingManager>();
     } catch (e) {
       logError('EmailChangeListener::_internal(): IS NOT REGISTERED: ${e.toString()}');
     }
@@ -140,7 +137,6 @@ class EmailChangeListener extends ChangeListener {
       _storeEmailDeliveryStateAction(accountId, userName, _newStateEmailDelivery!);
     } else if (PlatformInfo.isIOS) {
       _storeEmailDeliveryStateAction(accountId, userName, _newStateEmailDelivery!);
-      _updateKeychainSharingSession(accountId, _newStateEmailDelivery!.value);
     } else if (PlatformInfo.isAndroid) {
       _getStoredEmailDeliveryState(accountId, userName);
     }
@@ -328,11 +324,4 @@ class EmailChangeListener extends ChangeListener {
       ));
     }
   }
-
-  void _updateKeychainSharingSession(AccountId accountId, String emailDeliveryState) async {
-    if (_iosSharingManager == null) {
-      return;
-    }
-    await _iosSharingManager!.updateEmailDeliveryStateInKeyChain(accountId, emailDeliveryState);
-  }
 }
\ No newline at end of file
diff --git a/lib/main/utils/ios_sharing_manager.dart b/lib/main/utils/ios_sharing_manager.dart
index e42d4f335..bb261bea1 100644
--- a/lib/main/utils/ios_sharing_manager.dart
+++ b/lib/main/utils/ios_sharing_manager.dart
@@ -153,16 +153,6 @@ class IOSSharingManager {
     }
   }
 
-  Future updateEmailDeliveryStateInKeyChain(AccountId accountId, String newEmailDeliveryState) async {
-    final keychainSharingStored = await getKeychainSharingSession(accountId);
-    log('IOSSharingManager::updateEmailDeliveryStateInKeyChain:keychainSharingStored: $keychainSharingStored | newEmailDeliveryState: $newEmailDeliveryState');
-    if (keychainSharingStored == null) {
-      return;
-    }
-    final newKeychain = keychainSharingStored.updating(emailDeliveryState: newEmailDeliveryState);
-    await _keychainSharingManager.save(newKeychain);
-  }
-
   Future updateEmailStateInKeyChain(AccountId accountId, String newEmailState) async {
     final keychainSharingStored = await getKeychainSharingSession(accountId);
     log('IOSSharingManager::updateEmailStateInKeyChain:keychainSharingStored: $keychainSharingStored | newEmailState: $newEmailState');