diff --git a/.changeset/config.json b/.changeset/config.json
index 7920f52b81..902828cfe8 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -4,7 +4,7 @@
   "commit": false,
   "linked": [],
   "access": "public",
-  "baseBranch": "next",
+  "baseBranch": "origin/next",
   "updateInternalDependencies": "patch",
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true
diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml
index 6f813dbd37..e8a9dc7646 100644
--- a/.github/workflows/snapshot-release.yml
+++ b/.github/workflows/snapshot-release.yml
@@ -84,6 +84,8 @@ jobs:
       - name: Bump Package Versions
         id: changesets
         run: |
+          # Snapshots don't work in pre mode. See https://github.com/changesets/changesets/issues/1195
+          pnpm changeset pre exit
           pnpm exec changeset status --output status.output.json 2>&1
           pnpm exec changeset version --snapshot ${{ steps.getSnapshotName.outputs.result }}