diff --git a/CHANGELOG.md b/CHANGELOG.md
index f82d7a6234..2b12b08f78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 #### :bug: Bug fix
 
 - Fix error message that falsely suggested using coercion when it wouldn't work. https://github.com/rescript-lang/rescript/pull/7721
+- Fix hang in `rescript-editor-analysis.exe codeAction` that sometimes prevented ReScript files from being saved in VS Code. https://github.com/rescript-lang/rescript/pull/7731
 - Fix formatter removes () from functor type. https://github.com/rescript-lang/rescript/pull/7735
 - Rewatch: don't compile dev-dependencies of non local dependencies with `--dev`. https://github.com/rescript-lang/rescript/pull/7736
 
diff --git a/analysis/src/TypeUtils.ml b/analysis/src/TypeUtils.ml
index e6c7e8bc71..b066a62cc0 100644
--- a/analysis/src/TypeUtils.ml
+++ b/analysis/src/TypeUtils.ml
@@ -539,6 +539,7 @@ let rec resolveTypeForPipeCompletion ~env ~package ~lhsLoc ~full
     | _ -> None
   in
   match typFromLoc with
+  | Some ({desc = Tvar _} as t) -> (env, t)
   | Some typFromLoc ->
     typFromLoc |> resolveTypeForPipeCompletion ~lhsLoc ~env ~package ~full
   | None ->