diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index c31ad4c..0c9d1c6 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -122,7 +122,7 @@ jobs:
           docker push "$IMAGE:$VERSION"
 
           TRIGGER_MSG=$(git log -1 --format=%s "${{ github.sha }}")
-          PR_NUM=$(echo "$TRIGGER_MSG" | grep -oE '#[0-9]+' | head -1 | tr -d '#')
+          PR_NUM=$(echo "$TRIGGER_MSG" | grep -oE '#[0-9]+' | head -1 | tr -d '#' || true)
 
           CATEGORY="🔧 Maintenance"
           CHANGE_TITLE="$TRIGGER_MSG"
@@ -130,10 +130,12 @@ jobs:
           if [ -n "$PR_NUM" ]; then
             PR_JSON=$(curl -s -H "Authorization: token ${{ secrets.CI_PUSH_TOKEN }}" \
               "https://git.djeex.fr/api/v1/repos/Djeex/adguard-cidre/pulls/$PR_NUM")
-            PR_TITLE=$(echo "$PR_JSON" | jq -r '.title // empty')
-            LABELS=$(echo "$PR_JSON" | jq -r '.labels[].name' 2>/dev/null)
+            PR_TITLE=$(echo "$PR_JSON" | jq -r '.title // empty' 2>/dev/null || true)
+            LABELS=$(echo "$PR_JSON" | jq -r '.labels[]?.name' 2>/dev/null || true)
 
-            [ -n "$PR_TITLE" ] && CHANGE_TITLE="$PR_TITLE"
+            if [ -n "$PR_TITLE" ]; then
+              CHANGE_TITLE="$PR_TITLE"
+            fi
 
             if echo "$LABELS" | grep -qx 'bug'; then
               CATEGORY="⚠️ Hotfix"