diff --git a/generate-changelog.sh b/generate-changelog.sh
index 7d74159..ab8b77f 100755
--- a/generate-changelog.sh
+++ b/generate-changelog.sh
@@ -11,11 +11,12 @@ fi
 cd $(dirname "$0")/../../
 
 LATEST_RELEASE_TAG=$(gh release list --json tagName,isLatest --jq '.[] | select(.isLatest)|.tagName')
-if [[ -e $LATEST_RELEASE_TAG ]]; then # first release?
+if [[ -z "$LATEST_RELEASE_TAG" ]]; then # first release?
   LATEST_RELEASE_TAG=$(git rev-list --max-parents=0 HEAD) # first commit in the branch.
 fi
 
-PR_COMMITS=$(git log "$LATEST_RELEASE_TAG"..HEAD --oneline --pretty=format:"%s" main | grep -oE "#[0-9]+" | tr -d '#' | sort -u)
+GIT_LOG_OUTPUT=$(git log "$LATEST_RELEASE_TAG"..HEAD --oneline --pretty=format:"%s" main)
+PR_COMMITS=$(echo "$GIT_LOG_OUTPUT" | grep -oE "#[0-9]+" || true | tr -d '#' | sort -u)
 
 CHANGELOG_FILE=./CHANGELOG.md
 # File header Header