diff --git a/web/pgAdmin4.py b/web/pgAdmin4.py
index 0777ea352..3d4b2d134 100644
--- a/web/pgAdmin4.py
+++ b/web/pgAdmin4.py
@@ -105,7 +105,7 @@ app = create_app()
 app.config['sessions'] = dict()
 
 if setup_db_required:
-    setup.setup_db()
+    setup.setup_db(app)
 
 # Authentication sources
 if len(config.AUTHENTICATION_SOURCES) > 0:
diff --git a/web/setup.py b/web/setup.py
index 66b3a5a98..f83040f07 100644
--- a/web/setup.py
+++ b/web/setup.py
@@ -472,10 +472,11 @@ class ManagePreferences:
 
 
 @app.command()
-def setup_db():
+def setup_db(app: Annotated[str, typer.Argument(
+        help="This argument doesn't require in CLI mode.")] = None):
     """Setup the configuration database."""
 
-    app = create_app()
+    app = app or create_app()
     create_app_data_directory(config)
 
     print("pgAdmin 4 - Application Initialisation")