diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0076b2f63..4feeb29e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@
 
 #### :bug: Bug fix
 
+ - 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-vscode/pull/1112
+
 - Fix: show existing compiler errors and warnings on file open. https://github.com/rescript-lang/rescript-vscode/pull/1103
 
 - Fix: bug where we incorrectly showed a warning notification about something going wrong with incremental type checking, when in fact the compiler was reporting module-related type errors https://github.com/rescript-lang/rescript-vscode/pull/1090
diff --git a/analysis/src/TypeUtils.ml b/analysis/src/TypeUtils.ml
index 5967edebc..5cb35d0be 100644
--- a/analysis/src/TypeUtils.ml
+++ b/analysis/src/TypeUtils.ml
@@ -533,6 +533,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 ->