diff --git a/db.py b/db.py
index 15b22d0a16b8c5a374279f8dfcb6fec37e0d5d17..9ae0d82f465dce55d9dc852763a281773c084414 100644
--- a/db.py
+++ b/db.py
@@ -96,6 +96,12 @@ def commit_db(*args):
 		request.db.close()
 		g.db.commit()
 
+@app.teardown_appcontext
+def close_db(*args):
+	if 'db' in g:
+		g.db.close()
+		del g.db
+
 def searchquery(text, columns, match, tables, suffix, *suffixparams):
 	params = []
 	subexprs = []