diff --git a/acceptance/setup.sh b/acceptance/setup.sh
index 1756cf428ed..90f40191dec 100755
--- a/acceptance/setup.sh
+++ b/acceptance/setup.sh
@@ -36,18 +36,12 @@ echo "Wrote environment file ${WRITE_ENVIRONMENT_FILE}"
 cat ${WRITE_ENVIRONMENT_FILE}
 
 # waiting for default organization
-until [ "$(echo "$DEFAULTORG_RESPONSE" | jq -r '.result | length')" -eq 1 ]; do
+until $(echo "$DEFAULTORG_RESPONSE" | jq -r '.result | length') == 1
+do
   DEFAULTORG_RESPONSE=$(curl -s --request POST \
       --url "${ZITADEL_API_INTERNAL_URL}/v2/organizations/_search" \
       --header "Authorization: Bearer ${PAT}" \
       --header "Host: ${ZITADEL_API_DOMAIN}" \
-      -d '{"queries": [{"defaultQuery": {}}]}' )
-
-  if [ $? -ne 0 ]; then
-    echo "Error: Failed to fetch default organization response"
-    exit 1
-  fi
-
+      -d '{"queries": [{"defaultQuery": {"value": true}}]}'  )
   echo "Received default organization response: ${DEFAULTORG_RESPONSE}"
-  sleep 5
-done
\ No newline at end of file
+done