diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift
index 81bb41dc5..187c29bf7 100644
--- a/Signal/src/call/CallService.swift
+++ b/Signal/src/call/CallService.swift
@@ -322,6 +322,8 @@ protocol CallServiceObserver: class {
             }
 
             return race(timeout, callConnectedPromise)
+        }.then {
+            Logger.info("\(self.TAG) outgoing call connected.")
         }.catch { error in
             Logger.error("\(self.TAG) placing call failed with error: \(error)")
 
@@ -501,6 +503,8 @@ protocol CallServiceObserver: class {
             self.fulfillCallConnectedPromise = fulfill
 
             return race(promise, timeout)
+        }.then {
+            Logger.info("\(self.TAG) incoming call connected.")
         }.catch { error in
             guard self.call == newCall else {
                 Logger.debug("\(self.TAG) error for obsolete call: \(error)")
@@ -617,8 +621,6 @@ protocol CallServiceObserver: class {
         case .answering:
             call.state = .localRinging
             self.callUIAdapter.reportIncomingCall(call, thread: thread)
-            // cancel connection timeout
-            self.fulfillCallConnectedPromise?()
         case .remoteRinging:
             Logger.info("\(TAG) call alreading ringing. Ignoring \(#function)")
         case .connected:
@@ -735,6 +737,10 @@ protocol CallServiceObserver: class {
             return
         }
 
+        assert(self.fulfillCallConnectedPromise != nil)
+        // cancel connection timeout
+        self.fulfillCallConnectedPromise?()
+
         call.state = .connected
 
         // We don't risk transmitting any media until the remote client has admitted to being connected.
diff --git a/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift b/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift
index 8b142c06d..131b17971 100644
--- a/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift
+++ b/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift
@@ -84,7 +84,13 @@ final class CallKitCallUIAdaptee: NSObject, CallUIAdaptee, CXProviderDelegate {
         AssertIsOnMainThread()
         Logger.debug("\(self.TAG) \(#function)")
 
-        provider.reportCall(with: call.localId, endedAt: Date(), reason: CXCallEndedReason.failed)
+        switch (error) {
+        case .timeout(description: _):
+            provider.reportCall(with: call.localId, endedAt: Date(), reason: CXCallEndedReason.unanswered)
+        default:
+            provider.reportCall(with: call.localId, endedAt: Date(), reason: CXCallEndedReason.failed)
+        }
+
         self.callManager.removeCall(call)
     }