diff --git a/ref-test/app/__init__.py b/ref-test/app/__init__.py
index 37cf4b6..3007376 100644
--- a/ref-test/app/__init__.py
+++ b/ref-test/app/__init__.py
@@ -61,10 +61,8 @@ def create_app():
     app.register_blueprint(view, url_prefix='/admin/view')
     app.register_blueprint(analysis, url_prefix='/admin/analysis')
 
-    """Create Database Tables before First Request"""
-    @app.before_first_request
-    def _create_database_tables():
-        with app.app_context():
-            db.create_all()
+    """Create Database Tables when creating app"""
+    with app.app_context():
+        db.create_all()
 
     return app
\ No newline at end of file