diff --git a/Sources/BuildServerIntegration/BuildServerManager.swift b/Sources/BuildServerIntegration/BuildServerManager.swift
index f85cabd82..4cb60da0d 100644
--- a/Sources/BuildServerIntegration/BuildServerManager.swift
+++ b/Sources/BuildServerIntegration/BuildServerManager.swift
@@ -706,7 +706,7 @@ package actor BuildServerManager: QueueBasedMessageHandler {
   package func handle<Request: RequestType>(
     request: Request,
     id: RequestID,
-    reply: @Sendable @escaping (LSPResult<Request.Response>) -> Void
+    reply: @Sendable @escaping (Result<Request.Response, any Error>) -> Void
   ) async {
     let request = RequestAndReply(request, reply: reply)
     switch request {
diff --git a/Sources/BuildServerIntegration/BuiltInBuildServerAdapter.swift b/Sources/BuildServerIntegration/BuiltInBuildServerAdapter.swift
index 11023100b..c60f5e65e 100644
--- a/Sources/BuildServerIntegration/BuiltInBuildServerAdapter.swift
+++ b/Sources/BuildServerIntegration/BuiltInBuildServerAdapter.swift
@@ -120,7 +120,7 @@ actor BuiltInBuildServerAdapter: QueueBasedMessageHandler {
   func handle<Request: RequestType>(
     request: Request,
     id: RequestID,
-    reply: @Sendable @escaping (LSPResult<Request.Response>) -> Void
+    reply: @Sendable @escaping (Result<Request.Response, any Error>) -> Void
   ) async {
     let request = RequestAndReply(request, reply: reply)
     await buildServerHooks.preHandleRequest?(request.params)
diff --git a/Sources/SourceKitLSP/SourceKitLSPServer.swift b/Sources/SourceKitLSP/SourceKitLSPServer.swift
index 2883b0f3e..3a17cb63d 100644
--- a/Sources/SourceKitLSP/SourceKitLSPServer.swift
+++ b/Sources/SourceKitLSP/SourceKitLSPServer.swift
@@ -668,7 +668,7 @@ extension SourceKitLSPServer: QueueBasedMessageHandler {
         continue
       }
       logger.info("Implicitly cancelling request \(requestID)")
-      self.messageHandlingHelper.cancelRequest(id: requestID)
+      self.messageHandlingHelper.cancelRequest(id: requestID, error: .cancelled)
     }
   }
 
@@ -722,7 +722,7 @@ extension SourceKitLSPServer: QueueBasedMessageHandler {
   package func handle<Request: RequestType>(
     request params: Request,
     id: RequestID,
-    reply: @Sendable @escaping (LSPResult<Request.Response>) -> Void
+    reply: @Sendable @escaping (Result<Request.Response, any Error>) -> Void
   ) async {
     defer {
       if let request = params as? any TextDocumentRequest {