diff --git a/.github/actions/check_style/action.yml b/.github/actions/check_style/action.yml
index 39601e8c2599a985244a4c36d7fcfea6b8c12208..e95c6b493af4faf2f35f51eb2d421ed06da8cd7a 100644
--- a/.github/actions/check_style/action.yml
+++ b/.github/actions/check_style/action.yml
@@ -22,9 +22,3 @@ runs:
           run: |
               export SQUAWK_GITHUB_TOKEN=${{ github.token }}
               . ./script/squawk
-
-        - uses: bufbuild/buf-setup-action@v1
-        - uses: bufbuild/buf-breaking-action@v1
-          with:
-              input: "crates/rpc/proto/"
-              against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8ad9f57fd1d5c368eace41e7679376e00b6a4b56..b7bde60eec3b3999b9062e53c70280fefbeabc18 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,17 @@ jobs:
             - name: Run style checks
               uses: ./.github/actions/check_style
 
+            - name: Ensure fresh merge
+              run: |
+                git checkout -B temp
+                git merge -q origin/main -m "merge main into temp"
+
+            - uses: bufbuild/buf-setup-action@v1
+            - uses: bufbuild/buf-breaking-action@v1
+              with:
+                  input: "crates/rpc/proto/"
+                  against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
+
     tests:
         name: Run tests
         runs-on: