diff --git a/clang-tools-extra/clangd/index/Background.cpp b/clang-tools-extra/clangd/index/Background.cpp
index a46ba18f5b6c9f..9880c6b4ab2aaa 100644
--- a/clang-tools-extra/clangd/index/Background.cpp
+++ b/clang-tools-extra/clangd/index/Background.cpp
@@ -200,7 +200,7 @@ void BackgroundIndex::update(
   for (const auto &FileIt : FilesToUpdate) {
     auto Uri = FileIt.first();
     // ShardedIndex should always have a shard for a file in Index.Sources.
-    auto IF = ShardedIndex.getShard(Uri).getValue();
+    auto IF = std::move(ShardedIndex.getShard(Uri).getValue());
     PathRef Path = FileIt.getValue().first;
 
     // Only store command line hash for main files of the TU, since our
diff --git a/clang-tools-extra/clangd/index/FileIndex.cpp b/clang-tools-extra/clangd/index/FileIndex.cpp
index bf236bd8411b3f..b6ee91db20f5a7 100644
--- a/clang-tools-extra/clangd/index/FileIndex.cpp
+++ b/clang-tools-extra/clangd/index/FileIndex.cpp
@@ -381,7 +381,7 @@ void FileIndex::updatePreamble(PathRef Path, llvm::StringRef Version,
   for (auto Uri : ShardedIndex.getAllSources()) {
     // We are using the key received from ShardedIndex, so it should always
     // exist.
-    auto IF = ShardedIndex.getShard(Uri).getValue();
+    auto IF = std::move(ShardedIndex.getShard(Uri).getValue());
     PreambleSymbols.update(
         Uri, std::make_unique<SymbolSlab>(std::move(*IF.Symbols)),
         std::make_unique<RefSlab>(),