diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33954b221..1ca7a2f84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [UNRELEASED]
 
 - Update default CodeQL bundle version to 2.7.3. [#842](https://github.com/github/codeql-action/pull/842)
+- The `analyze` and `upload-sarif` actions will now wait up to 2 minutes for processing to complete so they can report any processing errors that occurred. This behavior can be disabled by setting the `wait-for-processing` action input to `"false"`.
 
 ## 1.0.25 - 06 Dec 2021
 
diff --git a/analyze/action.yml b/analyze/action.yml
index 50c8b3d31..104311272 100644
--- a/analyze/action.yml
+++ b/analyze/action.yml
@@ -55,7 +55,7 @@ inputs:
   wait-for-processing:
     description: If true, the Action will wait for the uploaded SARIF to be processed before completing.
     required: true
-    default: "false"
+    default: "true"
   token:
     default: ${{ github.token }}
   matrix:
diff --git a/upload-sarif/action.yml b/upload-sarif/action.yml
index 3f26f099b..ee87c6ec1 100644
--- a/upload-sarif/action.yml
+++ b/upload-sarif/action.yml
@@ -23,7 +23,7 @@ inputs:
   wait-for-processing:
     description: If true, the Action will wait for the uploaded SARIF to be processed before completing.
     required: true
-    default: "false"
+    default: "true"
 runs:
   using: 'node12'
   main: '../lib/upload-sarif-action.js'