diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f728f622..8543c5345 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Changes to Calva.
 
 ## [Unreleased]
+- Fix: [Connecting to an out-of-process nREPL server and a merged Figwheel-main build](https://github.com/BetterThanTomorrow/calva/issues/1386)
 
 ## [2.0.231] - 2021-12-14
 - Fix: [Calva randomly edits file while in Live Share](https://github.com/BetterThanTomorrow/calva/issues/1434)
diff --git a/src/connector.ts b/src/connector.ts
index 55108d707..df33e8ff7 100644
--- a/src/connector.ts
+++ b/src/connector.ts
@@ -381,6 +381,7 @@ async function makeCljsSessionClone(session, repl: ReplType, projectTypeName: st
                 state.analytics().logEvent("REPL", "StartedCLJS", repl.name).send();
                 outputWindow.append("; Cljs builds started");
                 newCljsSession = await session.clone();
+                newCljsSession.replType = 'cljs';
             } else {
                 state.analytics().logEvent("REPL", "FailedStartingCLJS", repl.name).send();
                 outputWindow.append("; Failed starting cljs repl");