diff --git a/Sources/BuildServerIntegration/DetermineBuildServer.swift b/Sources/BuildServerIntegration/DetermineBuildServer.swift
index 725433aea..9c3d06254 100644
--- a/Sources/BuildServerIntegration/DetermineBuildServer.swift
+++ b/Sources/BuildServerIntegration/DetermineBuildServer.swift
@@ -26,8 +26,10 @@ private func searchForCompilationDatabaseConfig(
   options: SourceKitLSPOptions
 ) -> BuildServerSpec? {
   let searchPaths =
-    (options.compilationDatabaseOrDefault.searchPaths ?? []).compactMap {
-      try? RelativePath(validating: $0)
+    (options.compilationDatabaseOrDefault.searchPaths ?? []).compactMap { searchPath in
+      orLog("Compilation DB search path") {
+        try RelativePath(validating: searchPath)
+      }
     } + [
       // These default search paths match the behavior of `clangd`
       try! RelativePath(validating: "."),
diff --git a/Sources/SourceKitLSP/SourceKitLSPServer.swift b/Sources/SourceKitLSP/SourceKitLSPServer.swift
index dd3c7b830..28df0d8b6 100644
--- a/Sources/SourceKitLSP/SourceKitLSPServer.swift
+++ b/Sources/SourceKitLSP/SourceKitLSPServer.swift
@@ -912,13 +912,7 @@ extension SourceKitLSPServer {
       logger.log("Cannot open workspace before server is initialized")
       throw NoCapabilityRegistryError()
     }
-    let options = SourceKitLSPOptions.merging(
-      base: self.options,
-      override: SourceKitLSPOptions(
-        path: workspaceFolder.fileURL?
-          .appending(components: ".sourcekit-lsp", "config.json")
-      )
-    )
+
     logger.log("Creating workspace at \(workspaceFolder.forLogging)")
     logger.logFullObjectInMultipleLogMessages(header: "Workspace options", options.loggingProxy)