diff --git a/app/store/store.js b/app/store/store.js
index 82c84ac6d..03a6f6ba4 100644
--- a/app/store/store.js
+++ b/app/store/store.js
@@ -175,6 +175,7 @@ export default function configureAppStore(initialState) {
                         const entities = {
                             ...state.entities,
                             general: {
+                                ...state.entities.general,
                                 credentials: {
                                     url,
                                 },
diff --git a/ios/UploadAttachments/UploadAttachments/UploadSession.swift b/ios/UploadAttachments/UploadAttachments/UploadSession.swift
index 7503380d7..5b59da853 100644
--- a/ios/UploadAttachments/UploadAttachments/UploadSession.swift
+++ b/ios/UploadAttachments/UploadAttachments/UploadSession.swift
@@ -82,11 +82,13 @@ import os.log
         guard let identifier = session.configuration.identifier else {return}
         do {
             let jsonObject = try JSONSerialization.jsonObject(with: data, options: []) as! NSDictionary
-            let fileInfos = jsonObject.object(forKey: "file_infos") as! NSArray
-            if fileInfos.count > 0 {
-                let fileInfoData = fileInfos[0] as! NSDictionary
-                let fileId = fileInfoData.object(forKey: "id") as! String
-                UploadSessionManager.shared.appendCompletedUploadToSession(identifier: identifier, fileId: fileId)
+            if jsonObject.object(forKey: "file_infos") != nil {
+                let fileInfos = jsonObject.object(forKey: "file_infos") as! NSArray
+                if fileInfos.count > 0 {
+                    let fileInfoData = fileInfos[0] as! NSDictionary
+                    let fileId = fileInfoData.object(forKey: "id") as! String
+                    UploadSessionManager.shared.appendCompletedUploadToSession(identifier: identifier, fileId: fileId)
+                }
             }
         } catch {
             if #available(iOS 12.0, *) {