diff --git a/.github/workflows/inspect-code.yml b/.github/workflows/inspect-code.yml
index 3eb3fb21..a96e90c3 100644
--- a/.github/workflows/inspect-code.yml
+++ b/.github/workflows/inspect-code.yml
@@ -13,6 +13,10 @@ on:
       - .github/workflows/inspect-code.yml
       - '**.cs'
 
+env:
+  BASE_REF: ${{ github.ref == 'refs/heads/master' && github.event.before ||
+                (github.event.base_ref || github.event.pull_request.base.ref || 'master') }}
+
 jobs:
   inspect:
     name: Resharper Inspect Code
@@ -60,7 +64,7 @@ jobs:
         run: dotnet build src
 
       - name: Run Code Cleanup
-        run: ../ci/code_cleanup.sh
+        run: ../ci/code_cleanup.sh "${{ env.BASE_REF }}"
         working-directory: src
 
       - name: Check Diff
diff --git a/ci/code_cleanup.sh b/ci/code_cleanup.sh
index 021b2508..9a4e47b5 100755
--- a/ci/code_cleanup.sh
+++ b/ci/code_cleanup.sh
@@ -1,6 +1,11 @@
 #!/usr/bin/env bash
+ref="$1"
+changed_files="$(git diff --relative --name-only $ref... | egrep '\.cs$')"
 
-changed_files="$(git diff --relative --name-only origin/master... | egrep '\.cs$')"
+if [[ -z "$changed_files" ]]; then
+  echo "No changed files detected; skipping code cleanup"
+  exit 0
+fi
 
 echo '--------------------------------------------------'
 echo 'Files to be checked for code cleanup:'