diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
index ab543b7430..a1e2429c85 100644
--- a/.github/workflows/ci-test-custom-script.yml
+++ b/.github/workflows/ci-test-custom-script.yml
@@ -264,19 +264,15 @@ jobs:
           echo Remote $COMMIT_INFO_REMOTE
 
       - name: Set Commit Message
+        continue-on-error: true
         env:
-          EVENT_COMMITS: ${{ toJson(github.event.commits[0].message) }}
+          EVENT_COMMITS: ${{ github.event.commits[0].message }}
         run: |
-          eventCommit=$(echo ${{env.EVENT_COMMITS}} | sed "s/'//g")
+          eventCommit="$(echo "$EVENT_COMMITS" | sed "s/'//g")"
           if [[ ${{ inputs.pr }} -ne 0 ]]; then
             echo "COMMIT_INFO_MESSAGE=${{ env.COMMIT_INFO_MESSAGE }}" >> $GITHUB_ENV
           else
-            if [[ '$eventCommit' == 'null' ]]; then
-              echo "COMMIT_INFO_MESSAGE=$(echo ${{ github.event_name }} | perl -pe 's/(^|_)./uc($&)/ge;s/_//g')" >> $GITHUB_ENV
-              echo "COMMIT_INFO_MESSAGE=${{ env.COMMIT_INFO_MESSAGE}} by ${{ env.COMMIT_INFO_AUTHOR }}" >> $GITHUB_ENV
-            else
-              echo "COMMIT_INFO_MESSAGE=$(echo "$eventCommit" | awk -F '\\\\n' '{print $1}' | sed 's/^"//;s/"$//')" >> $GITHUB_ENV
-            fi
+            echo "COMMIT_INFO_MESSAGE=$(echo "$eventCommit" | awk -F '\\\\n' '{print $1}' | sed 's/^"//;s/"$//')" >> $GITHUB_ENV
           fi
 
       - name: Run the cypress test