diff --git a/.changeset/fluffy-jeans-cheat.md b/.changeset/fluffy-jeans-cheat.md
deleted file mode 100644
index a845151cc840..000000000000
--- a/.changeset/fluffy-jeans-cheat.md
+++ /dev/null
@@ -1,2 +0,0 @@
----
----
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6f9167b8610f..a5a3f41eed55 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -55,6 +55,11 @@ jobs:
           fi
           scripts/update-next-version.sh --replace "$NEW_VERSION"
 
+      # The changeset action does a hard reset, so we need to save
+      # the changes in a stash so they can be popped later in the `version` command
+      - name: Stash changes
+        run: git stash push -u -m __automated-changes
+
       - name: Create Release Pull Request
         id: changesets-action
         uses: changesets/action@e0145edc7d9d8679003495b11f87bd8ef63c0cba # v1.5.3
diff --git a/package.json b/package.json
index 6bf032efcc9a..be6968bc4715 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "check": "cargo biome-cli-dev check",
     "ci": "cargo biome-cli-dev ci",
     "//": "when we create the release PR, we need to update the lock file with the new versions",
-    "version": "changeset version && pnpm i --lockfile-only"
+    "version": "changeset version && pnpm i --lockfile-only && (git stash list | grep -q '__automated-changes' && git -c advice.skippedCherryPicks=false stash pop || echo 'No stash to pop')"
   },
   "keywords": [],
   "author": "Biome Developers and Contributors",