diff --git a/.github/workflows/workflow-create-release.yml b/.github/workflows/workflow-create-release.yml
index ff57215..ad1426d 100644
--- a/.github/workflows/workflow-create-release.yml
+++ b/.github/workflows/workflow-create-release.yml
@@ -30,7 +30,7 @@ jobs:
     steps:
       - name: Create GitHub release
         env:
-          GH_TOKEN: ${{ secrets.gh_token != '' && secrets.gh_token || secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.gh_token || github.token }}
           TAG_NAME: ${{ inputs.tag-name }}
           PREVIOUS_TAG: ${{ inputs.previous-tag }}
           MERGED_PRS: ${{ inputs.merged-prs }}
@@ -51,7 +51,7 @@ jobs:
             if [ -n "$previous_tag" ]; then
               merged_entries=()
               commit_messages=$(gh api "repos/${GITHUB_REPOSITORY}/compare/${previous_tag}...${tag}" --jq '.commits[].commit.message' 2>/dev/null || true)
-              pr_numbers=$(grep -oE '#[0-9]+' <<<"$commit_messages" | tr -d '#' | sort -u)
+              pr_numbers=$(grep -oE '#[0-9]+' <<<"$commit_messages" | tr -d '#' | sort -u || true)
               for pr_number in $pr_numbers; do
                 pr_json=$(gh pr view "$pr_number" -R "$GITHUB_REPOSITORY" --json number,title,author --jq '{number:.number,title:.title,author:(.author.login // "bot")}' 2>/dev/null || true)
                 if [ -n "$pr_json" ]; then