diff --git a/.github/workflows/spotless-check.yml b/.github/workflows/spotless-check.yml
index f4e616fbb4..6fb1bbeca8 100644
--- a/.github/workflows/spotless-check.yml
+++ b/.github/workflows/spotless-check.yml
@@ -20,11 +20,12 @@ jobs:
       - name: spotless:check
         run: mvn spotless:check
       -  uses: mshick/add-pr-comment@v2
-         if: always()
+         # Only run if the previous step failed
+         if: failure() && steps.spotless_check.outcome == 'failure'
          with:
            proxy-url: https://slack-bots.azure.smilecdr.com/robogary/github
            message-success: |
-             Formatting check succeeded!
+             Formatting check succeeded! This should never run, because the step is skipped on workflow success.
            message-failure: |
              **This Pull Request has failed the formatting check**