diff --git a/frappe/app.py b/frappe/app.py
index 3c768c3d1d..2fe9991c4c 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -327,6 +327,9 @@ def after_request(rollback):
 	):
 		frappe.db.commit()
 		rollback = False
+	elif frappe.db:
+		frappe.db.rollback()
+		rollback = False
 
 	# update session
 	if getattr(frappe.local, "session_obj", None):