diff --git a/filebrowser/run.sh b/filebrowser/run.sh
index d08162b78..7bd9c35a6 100644
--- a/filebrowser/run.sh
+++ b/filebrowser/run.sh
@@ -154,4 +154,8 @@ PGID=0
 bashio::log.info "Default username/password : admin/admin"
 bashio::log.info "Please wait 1 or 2 minutes to allow the server to load"
 
-/./filebrowser $CERTFILE $KEYFILE --root=/ --address=0.0.0.0 --database=/config/filebrowser/filebrowser.db
+if bashio::config.true 'NoAuth'; then
+  filebrowser config set --auth.method=noauth
+fi
+
+/./filebrowser $CERTFILE $KEYFILE --root=/ --address=0.0.0.0 --database=/config/filebrowser/filebrowser.dB