diff --git a/website/__init__.py b/website/__init__.py
index 29d88c25..4a60c25c 100644
--- a/website/__init__.py
+++ b/website/__init__.py
@@ -21,7 +21,8 @@ def create_app():
 
     from .models import User, Note
 
-    create_database(app)
+    with app.app_context():
+        db.create_all()
 
     login_manager = LoginManager()
     login_manager.login_view = 'auth.login'
@@ -34,7 +35,4 @@ def load_user(id):
     return app
 
 
-def create_database(app):
-    if not path.exists('website/' + DB_NAME):
-        db.create_all(app=app)
-        print('Created Database!')
+