diff --git a/.github/workflows/docs-pr-app.yml b/.github/workflows/docs-pr-app.yml
index 5f0a28f7d8..0fd88a093b 100644
--- a/.github/workflows/docs-pr-app.yml
+++ b/.github/workflows/docs-pr-app.yml
@@ -1,4 +1,4 @@
-name: Render PR deploy
+name: Render PR deploy Docs
 on:
   pull_request_target:
     types: [labeled, unlabeled, closed]
diff --git a/.github/workflows/render-preview-deploy.yml b/.github/workflows/render-preview-deploy.yml
index 4b92ba62b0..a91e66cca6 100644
--- a/.github/workflows/render-preview-deploy.yml
+++ b/.github/workflows/render-preview-deploy.yml
@@ -252,7 +252,7 @@ jobs:
           sudo apt install postgresql-client -y
 
       - name: Wait after installing PostgreSQL
-        run: sleep 25  
+        run: sleep 25
 
       - name: Drop PostgreSQL PR database
         env:
@@ -261,7 +261,12 @@ jobs:
           PGUSER: ${{ secrets.RENDER_DS_PG_USER }}
           PGDATABASE: ${{ env.PR_NUMBER }}
         run: |
-          PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGDATABASE\" ;"
+          if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGDATABASE; then
+            echo "Database $PGDATABASE exists, deleting..."
+            PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGDATABASE\" ;"
+          else
+            echo "Database $PGDATABASE does not exist."
+          fi
 
   suspend-review-app:
     if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-review-app' }}