diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index ed4bd9dd9..e8ae7a727 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -165,7 +165,7 @@ services:
       DB_PASSWORD: ${POSTGRES_PASSWORD:-devpassword}
       DB_NAME: chat
       AZURE_OPENAI_ENDPOINT: ${AZURE_OPENAI_ENDPOINT}
-      AZURE_OPENAI_API_KEY: ${AZURE_OPENAI_API_KEY}
+      AZURE_OPENAI_API_KEY: ${AZURE_OPENAI_API_KEY:-}
       AZURE_OPENAI_API_VERSION: ${AZURE_OPENAI_API_VERSION:-2024-12-01-preview}
       MANA_AUTH_URL: http://mana-auth:3001
     depends_on:
diff --git a/scripts/setup-databases.sh b/scripts/setup-databases.sh
index 78a780e8f..95560c6cd 100755
--- a/scripts/setup-databases.sh
+++ b/scripts/setup-databases.sh
@@ -55,7 +55,12 @@ push_schema() {
     local filter=$1
     local name=$2
     echo -e "${YELLOW}Pushing schema for ${name}...${NC}"
-    if pnpm --filter "$filter" db:push --force 2>/dev/null; then
+    local output
+    output=$(pnpm --filter "$filter" db:push --force 2>&1)
+    local exit_code=$?
+    if echo "$output" | grep -q "No projects matched the filters\|None of the selected packages has"; then
+        echo -e "  ${YELLOW}⊘ Skipped (no db:push script for ${filter})${NC}"
+    elif [ $exit_code -eq 0 ]; then
         echo -e "  ${GREEN}✓ Schema pushed${NC}"
     else
         echo -e "  ${RED}✗ Failed (may not have db:push script)${NC}"