diff --git a/sphinx/Core Data/Chat/Chat+CoreDataClass.swift b/sphinx/Core Data/Chat/Chat+CoreDataClass.swift
index 97eb3d3b..813fd45e 100644
--- a/sphinx/Core Data/Chat/Chat+CoreDataClass.swift	
+++ b/sphinx/Core Data/Chat/Chat+CoreDataClass.swift	
@@ -470,7 +470,7 @@ public class Chat: NSManagedObject {
     ) {
         let backgroundContext = CoreDataManager.sharedManager.getBackgroundContext()
         
-        backgroundContext.performAndWait { [weak self] in
+        backgroundContext.perform { [weak self] in
             guard let self = self else {
                 return
             }
diff --git a/sphinx/Scenes/Chat/View Controllers/New Chat View Controller/View Model & Data Source/NewChatTableDataSource/NewChatTableDataSource+ResultsControllerExtension.swift b/sphinx/Scenes/Chat/View Controllers/New Chat View Controller/View Model & Data Source/NewChatTableDataSource/NewChatTableDataSource+ResultsControllerExtension.swift
index a8c83366..bf633ee8 100644
--- a/sphinx/Scenes/Chat/View Controllers/New Chat View Controller/View Model & Data Source/NewChatTableDataSource/NewChatTableDataSource+ResultsControllerExtension.swift	
+++ b/sphinx/Scenes/Chat/View Controllers/New Chat View Controller/View Model & Data Source/NewChatTableDataSource/NewChatTableDataSource+ResultsControllerExtension.swift	
@@ -864,7 +864,7 @@ extension NewChatTableDataSource : NSFetchedResultsControllerDelegate {
                 if let messages = firstSection.objects as? [TransactionMessage] {
                     if !self.isThread {
                         ///Do not processes aliases and timezone on thread since it came from chat
-                        self.chat?.processAliasesFrom(messages: messages.reversed())
+                        self.chat?.processAliases()
                     }
                     
                     self.messagesCountFetched = messages.count