diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ec5167..7192a22 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,7 @@ jobs:
       run: go test -test.v -race -cover ./...
 
   conventional-commits:
+    if: github.event_name == 'pull_request' # Only check PRs.
     runs-on: ubuntu-latest
 
     steps:
@@ -35,5 +36,4 @@ jobs:
       with:
         fetch-depth: 0
     - run: pip3 install -U Commitizen
-      # The commit hash here is that of the commit where we started using conventional commits.
-    - run: cz check --rev-range deebab92..HEAD
+    - run: cz check --rev-range origin/${{ github.base_ref }}..HEAD