diff --git a/src/.flaskenv b/src/.flaskenv
index f5a0a35..36304ab 100644
--- a/src/.flaskenv
+++ b/src/.flaskenv
@@ -1,3 +1,4 @@
 FLASK_APP=flaskapp
 FLASK_DEBUG=True
-FLASK_RUN_PORT=8080
\ No newline at end of file
+FLASK_RUN_PORT=8080
+FLASK_DB_INIT=True
\ No newline at end of file
diff --git a/src/flaskapp/__init__.py b/src/flaskapp/__init__.py
index aefbd61..807a59c 100644
--- a/src/flaskapp/__init__.py
+++ b/src/flaskapp/__init__.py
@@ -40,4 +40,7 @@ def create_app(test_config: dict = None) -> Flask:
     from .utils import db_cli
     app.cli.add_command(db_cli)
 
-    return app
+    with app.app_context():
+        if os.getenv('FLASK_DB_INIT') == 'True':
+            db.create_all()
+        return app