diff --git a/.changeset/plenty-areas-tie.md b/.changeset/plenty-areas-tie.md
new file mode 100644
index 0000000..3422a5e
--- /dev/null
+++ b/.changeset/plenty-areas-tie.md
@@ -0,0 +1,5 @@
+---
+"@changesets/action": patch
+---
+
+Fixed initial `.changeset` state being picked up, when `cwd` parameter is provided
diff --git a/.changeset/splendid-facts-like.md b/.changeset/splendid-facts-like.md
new file mode 100644
index 0000000..e2c9a52
--- /dev/null
+++ b/.changeset/splendid-facts-like.md
@@ -0,0 +1,5 @@
+---
+"@changesets/action": patch
+---
+
+Fixed `.changeset` state being picked for the version command when `cwd` parameter is provided
diff --git a/src/index.ts b/src/index.ts
index 6526bed..ad227f9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -20,6 +20,7 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
   }
 
   const cwd = path.resolve(getOptionalInput("cwd") ?? "");
+  core.info(`using resolved cwd: ${cwd}`);
 
   const octokit = setupOctokit(githubToken);
   const commitMode = getOptionalInput("commitMode") ?? "git-cli";
@@ -45,7 +46,7 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
     `machine github.com\nlogin github-actions[bot]\npassword ${githubToken}`
   );
 
-  let { changesets } = await readChangesetState();
+  let { changesets } = await readChangesetState(cwd);
 
   let publishScript = core.getInput("publish");
   let hasChangesets = changesets.length !== 0;
@@ -142,6 +143,7 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
         githubToken,
         git,
         octokit,
+        cwd,
         prTitle: getOptionalInput("title"),
         commitMessage: getOptionalInput("commit"),
         hasPublishScript,