diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 94d8287f91..9796ac1362 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -40,11 +40,12 @@ jobs:
       id: chromatic
       uses: chromaui/action@v1
       with:
+        exitOnceUploaded: true
         projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
         storybookBuildDir: storybook-static
         workingDir: packages/frontend
     - name: Compare on Chromatic
-      if: github.event_name == 'pull_request_target'
+      if: github.event_name == 'pull_request'
       run: pnpm --filter frontend chromatic --exit-once-uploaded --patch-build ${{ github.head_ref }}...${{ github.base_ref }}
       env:
         CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}