diff --git a/komga/README.md b/komga/README.md
index 89dc8fe8ab..bcb67e8fde 100644
--- a/komga/README.md
+++ b/komga/README.md
@@ -59,9 +59,10 @@ authenticate through it.
 
 ## Data
 
-Komga's database, logs and search index are stored in the add-on configuration directory
-(`/addon_configs/xxx-komga`), so they survive add-on updates. Libraries stay where you put them,
-under `/media`, `/share` or a mounted disk.
+Komga's database, logs and search index live in `/config` inside the add-on, which Home Assistant
+maps to this add-on's own configuration directory — `/addon_configs/<repository_id>_komga`, browsable
+with the Filebrowser add-on. They survive add-on updates. Libraries stay where you put them, under
+`/media`, `/share` or a mounted disk.
 
 ## Support
 
diff --git a/komga/rootfs/etc/services.d/nginx/run b/komga/rootfs/etc/services.d/nginx/run
index 19698e7666..c7febdae96 100755
--- a/komga/rootfs/etc/services.d/nginx/run
+++ b/komga/rootfs/etc/services.d/nginx/run
@@ -3,11 +3,17 @@
 set -e
 # ==============================================================================
 
-# Wait for komga to become available. First boot builds the database, so leave
-# it a wide margin before nginx starts answering ingress requests.
-# Non fatal : bashio and bashio-standalone disagree on the argument order, and
-# a failed wait must not keep nginx (hence ingress) down.
-bashio::net.wait_for 25600 localhost 900 || true
+# Wait for komga to answer before nginx starts serving ingress. First boot
+# builds the database, so leave a wide margin, but poll rather than call
+# bashio::net.wait_for : bashio takes (port host timeout) while the bundled
+# bashio-standalone.sh takes (host port timeout), and picking the wrong one
+# would either fail instantly or block for the whole timeout.
+for _ in $(seq 1 180); do
+    if curl -sf -o /dev/null "http://127.0.0.1:25600/komga/"; then
+        break
+    fi
+    sleep 5
+done
 
 bashio::log.info "Starting NGinx..."
 exec nginx