diff --git a/model_service/app.py b/model_service/app.py
index 3a8650b..415642d 100644
--- a/model_service/app.py
+++ b/model_service/app.py
@@ -46,9 +46,12 @@ app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 db.init_app(app)
 storage.init_app(app)
 
-with app.app_context():
+
+@app.before_first_request
+def create_db():
     db.create_all()
 
+
 # register error handlers
 register_all_error_handlers(app)