diff --git a/clang-tools-extra/clangd/index/remote/server/Server.cpp b/clang-tools-extra/clangd/index/remote/server/Server.cpp
--- a/clang-tools-extra/clangd/index/remote/server/Server.cpp
+++ b/clang-tools-extra/clangd/index/remote/server/Server.cpp
@@ -357,13 +357,12 @@
     return Status.getError().value();
   }
 
-  auto Index = std::make_unique<clang::clangd::SwapIndex>(
-      clang::clangd::loadIndex(IndexPath));
-
-  if (!Index) {
+  auto SymIndex = clang::clangd::loadIndex(IndexPath);
+  if (!SymIndex) {
     llvm::errs() << "Failed to open the index.\n";
     return -1;
   }
+  auto Index = std::make_unique<clang::clangd::SwapIndex>(std::move(SymIndex));
 
   std::thread HotReloadThread([&Index, &Status, &FS]() {
     llvm::vfs::Status LastStatus = *Status;