diff --git a/src/messages/workspace.cc b/src/messages/workspace.cc
index 86ce0b25..384442b3 100644
--- a/src/messages/workspace.cc
+++ b/src/messages/workspace.cc
@@ -54,11 +54,11 @@ void MessageHandler::workspace_didChangeWatchedFiles(
       if (cur[0] == '.')
         return;
 
-    IndexMode mode =
-        wfiles->GetFile(path) ? IndexMode::Normal : IndexMode::Background;
     switch (event.type) {
     case FileChangeType::Created:
     case FileChangeType::Changed: {
+      IndexMode mode =
+          wfiles->GetFile(path) ? IndexMode::Normal : IndexMode::Background;
       pipeline::Index(path, {}, mode, true);
       if (event.type == FileChangeType::Changed) {
         if (mode == IndexMode::Normal)
@@ -69,7 +69,7 @@ void MessageHandler::workspace_didChangeWatchedFiles(
       break;
     }
     case FileChangeType::Deleted:
-      pipeline::Index(path, {}, mode, false);
+      pipeline::Index(path, {}, IndexMode::Delete, false);
       manager->OnClose(path);
       break;
     }
diff --git a/src/pipeline.cc b/src/pipeline.cc
index 2023c12c..b344dc0f 100644
--- a/src/pipeline.cc
+++ b/src/pipeline.cc
@@ -224,7 +224,6 @@ bool Indexer_Parse(SemaManager *completion, WorkingFiles *wfiles,
     return false;
   }
 
-  // must_exist is currently unused.
   Project::Entry entry =
       project->FindEntry(request.path, true, request.must_exist);
   if (request.must_exist && entry.filename.empty())
@@ -234,25 +233,28 @@ bool Indexer_Parse(SemaManager *completion, WorkingFiles *wfiles,
   std::string path_to_index = entry.filename;
   std::unique_ptr<IndexFile> prev;
 
-  bool deleted = false, no_linkage = g_config->index.initialNoLinkage ||
-                                     request.mode != IndexMode::Background;
+  bool deleted = request.mode == IndexMode::Delete,
+       no_linkage = g_config->index.initialNoLinkage ||
+                    request.mode != IndexMode::Background;
   int reparse = 0;
-  std::optional<int64_t> write_time = LastWriteTime(path_to_index);
-  if (!write_time) {
-    deleted = true;
-  } else {
-    if (vfs->Stamp(path_to_index, *write_time, no_linkage ? 2 : 0))
-      reparse = no_linkage ? 2 : 1;
-    if (request.path != path_to_index) {
-      std::optional<int64_t> mtime1 = LastWriteTime(request.path);
-      if (!mtime1)
-        deleted = true;
-      else if (vfs->Stamp(request.path, *mtime1, no_linkage ? 2 : 0))
-        reparse = 2;
-    }
-  }
   if (deleted)
     reparse = 2;
+  else if (!(g_config->index.onChange && wfiles->GetFile(path_to_index))) {
+    std::optional<int64_t> write_time = LastWriteTime(path_to_index);
+    if (!write_time) {
+      deleted = true;
+    } else {
+      if (vfs->Stamp(path_to_index, *write_time, no_linkage ? 2 : 0))
+        reparse = no_linkage ? 2 : 1;
+      if (request.path != path_to_index) {
+        std::optional<int64_t> mtime1 = LastWriteTime(request.path);
+        if (!mtime1)
+          deleted = true;
+        else if (vfs->Stamp(request.path, *mtime1, no_linkage ? 2 : 0))
+          reparse = 2;
+      }
+    }
+  }
 
   if (g_config->index.onChange) {
     reparse = 2;
diff --git a/src/pipeline.hh b/src/pipeline.hh
index 2d0db15b..cb983fe4 100644
--- a/src/pipeline.hh
+++ b/src/pipeline.hh
@@ -30,6 +30,7 @@ struct VFS {
 };
 
 enum class IndexMode {
+  Delete,
   Background,
   OnChange,
   Normal,