diff --git a/ios/TwakeMailNSE/Keychain/KeychainController.swift b/ios/TwakeMailNSE/Keychain/KeychainController.swift
index a2bacbf4b..b54321c0b 100644
--- a/ios/TwakeMailNSE/Keychain/KeychainController.swift
+++ b/ios/TwakeMailNSE/Keychain/KeychainController.swift
@@ -42,18 +42,18 @@ class KeychainController: KeychainControllerDelegate {
     
     func updateEmailDeliveryStateToKeychain(accountId: String, newEmailDeliveryState: String) {
         do {
-            if let sharingSession = retrieveSharingSessionFromKeychain(accountId: accountId) {
-                let newSharingSession = sharingSession.updateEmailDeliveryState(newEmailDeliveryState: newEmailDeliveryState)
-                try keychain.set(newSharingSession.toJson() ?? "", key: accountId)
+            if let sharingSession = retrieveSharingSessionFromKeychain(accountId: accountId),
+               let newSharingSessionData = sharingSession.updateEmailDeliveryState(newEmailDeliveryState: newEmailDeliveryState).toData() {
+                try keychain.set(newSharingSessionData, key: accountId)
             }
         } catch {}
     }
     
     func updateTokenOidc(accountId: String, newTokenOidc: TokenOidc) {
         do {
-            if let sharingSession = retrieveSharingSessionFromKeychain(accountId: accountId) {
-                let newSharingSession = sharingSession.updateTokenOidc(newTokenOidc: newTokenOidc)
-                try keychain.set(newSharingSession.toJson() ?? "", key: accountId)
+            if let sharingSession = retrieveSharingSessionFromKeychain(accountId: accountId),
+               let newSharingSessionData = sharingSession.updateTokenOidc(newTokenOidc: newTokenOidc).toData() {
+                try keychain.set(newSharingSessionData, key: accountId)
             }
         } catch {}
     }
diff --git a/ios/TwakeMailNSE/Model/KeychainSharingSession.swift b/ios/TwakeMailNSE/Model/KeychainSharingSession.swift
index 47bd690b4..4567d9cc5 100644
--- a/ios/TwakeMailNSE/Model/KeychainSharingSession.swift
+++ b/ios/TwakeMailNSE/Model/KeychainSharingSession.swift
@@ -55,11 +55,4 @@ extension KeychainSharingSession {
         }
         return nil
     }
-    
-    func toJson() -> String? {
-        if let data = toData(), let jsonString = String(data: data, encoding: .utf8) {
-            return jsonString
-        }
-        return nil
-    }
 }