diff --git a/Session/Calls/Call Management/SessionCallManager.swift b/Session/Calls/Call Management/SessionCallManager.swift
index 235992f4f..823f23477 100644
--- a/Session/Calls/Call Management/SessionCallManager.swift	
+++ b/Session/Calls/Call Management/SessionCallManager.swift	
@@ -105,10 +105,10 @@ public final class SessionCallManager: NSObject {
         guard let call = currentCall else { return }
         if let reason = reason {
             self.provider.reportCall(with: call.callID, endedAt: nil, reason: reason)
+            if reason == .answeredElsewhere { return }
             switch (reason) {
             case .unanswered: call.updateCallMessage(mode: .unanswered)
             case .declinedElsewhere: call.updateCallMessage(mode: .local)
-            case .answeredElsewhere: break
             default: call.updateCallMessage(mode: .remote)
             }
         } else {
diff --git a/Session/Meta/AppDelegate.swift b/Session/Meta/AppDelegate.swift
index 68d30f129..0d2bbdeb9 100644
--- a/Session/Meta/AppDelegate.swift
+++ b/Session/Meta/AppDelegate.swift
@@ -19,18 +19,40 @@ extension AppDelegate {
         presentingVC.present(callVC, animated: true, completion: nil)
     }
     
-    @objc func dismissAllCallUI() {
+    private func dismissAllCallUI() {
         if let currentBanner = IncomingCallBanner.current { currentBanner.dismiss() }
         if let callVC = CurrentAppContext().frontmostViewController() as? CallVC { callVC.handleEndCallMessage() }
         if let miniCallView = MiniCallView.current { miniCallView.dismiss() }
     }
     
+    private func showCallUIForCall(_ call: SessionCall) {
+        DispatchQueue.main.async {
+            if CurrentAppContext().isMainAppAndActive {
+                guard let presentingVC = CurrentAppContext().frontmostViewController() else { preconditionFailure() } // TODO: Handle more gracefully
+                if let conversationVC = presentingVC as? ConversationVC, let contactThread = conversationVC.thread as? TSContactThread, contactThread.contactSessionID() == call.sessionID {
+                    let callVC = CallVC(for: call)
+                    callVC.conversationVC = conversationVC
+                    conversationVC.inputAccessoryView?.isHidden = true
+                    conversationVC.inputAccessoryView?.alpha = 0
+                    presentingVC.present(callVC, animated: true, completion: nil)
+                }
+            }
+            call.reportIncomingCallIfNeeded{ error in
+                if let error = error {
+                    SNLog("[Calls] Failed to report incoming call to CallKit due to error: \(error)")
+                    let incomingCallBanner = IncomingCallBanner(for: call)
+                    incomingCallBanner.show()
+                }
+            }
+        }
+    }
+    
     @objc func setUpCallHandling() {
         // Pre offer messages
         MessageReceiver.handleNewCallOfferMessageIfNeeded = { (message, transaction) in
             guard CurrentAppContext().isMainApp else { return }
             let callManager = AppEnvironment.shared.callManager
-            // Ignore pre offer message afte the same call instance has been generated
+            // Ignore pre offer message after the same call instance has been generated
             if let currentCall = callManager.currentCall, currentCall.uuid == message.uuid! { return }
             guard callManager.currentCall == nil && SSKPreferences.areCallsEnabled else {
                 callManager.handleIncomingCallOfferInBusyOrUnenabledState(offerMessage: message, using: transaction)
@@ -44,25 +66,7 @@ extension AppDelegate {
             if let caller = message.sender, let uuid = message.uuid {
                 let call = SessionCall(for: caller, uuid: uuid, mode: .answer)
                 call.callMessageTimestamp = message.sentTimestamp
-                DispatchQueue.main.async {
-                    if CurrentAppContext().isMainAppAndActive {
-                        guard let presentingVC = CurrentAppContext().frontmostViewController() else { preconditionFailure() } // TODO: Handle more gracefully
-                        if let conversationVC = presentingVC as? ConversationVC, let contactThread = conversationVC.thread as? TSContactThread, contactThread.contactSessionID() == caller {
-                            let callVC = CallVC(for: call)
-                            callVC.conversationVC = conversationVC
-                            conversationVC.inputAccessoryView?.isHidden = true
-                            conversationVC.inputAccessoryView?.alpha = 0
-                            presentingVC.present(callVC, animated: true, completion: nil)
-                        }
-                    }
-                    call.reportIncomingCallIfNeeded{ error in
-                        if let error = error {
-                            SNLog("[Calls] Failed to report incoming call to CallKit due to error: \(error)")
-                            let incomingCallBanner = IncomingCallBanner(for: call)
-                            incomingCallBanner.show()
-                        }
-                    }
-                }
+                self.showCallUIForCall(call)
             }
         }
         // Offer messages
diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
index 5c2e84feb..ade9f21b2 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift	
@@ -271,8 +271,6 @@ extension MessageReceiver {
             handleNewCallOfferMessageIfNeeded?(message, transaction)
         case .offer:
             print("[Calls] Received offer message.")
-            let transaction = transaction as! YapDatabaseReadWriteTransaction
-            handleNewCallOfferMessageIfNeeded?(message, transaction)
             handleOfferCallMessage?(message)
         case .answer:
             print("[Calls] Received answer message.")