diff --git a/files/__main__.py b/files/__main__.py
index 2f096b0d9..1f8a8657c 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -94,14 +94,19 @@ def before_request():
 @app.teardown_appcontext
 def teardown_request(error):
 	if hasattr(g, 'db') and g.db:
-		g.db.commit()
+		g.db.rollback()
 		g.db.close()
+		del g.db
 	stdout.flush()
 
 @app.after_request
 def after_request(response):
 	response.headers.add("Strict-Transport-Security", "max-age=31536000")
 	response.headers.add("X-Frame-Options", "deny")
+	if response.status_code == 200:
+		g.db.commit()
+		g.db.close()
+		del g.db
 	return response
 
 if app.config["SERVER_NAME"] == 'localhost':
diff --git a/files/helpers/cron.py b/files/helpers/cron.py
index 497383aad..47a4595a1 100644
--- a/files/helpers/cron.py
+++ b/files/helpers/cron.py
@@ -35,4 +35,6 @@ def cron(every_5m, every_1h, every_1d, every_1mo):
 
 	if every_1mo:
 		give_monthly_marseybux_task()
-		g.db.commit()
\ No newline at end of file
+		g.db.commit()
+
+	g.db.close()
\ No newline at end of file