diff --git a/frappe/app.py b/frappe/app.py
index b9db59cdb1..298d94b06c 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -25,7 +25,7 @@ from frappe.utils import get_site_name, sanitize_html
 from frappe.utils.error import make_error_snapshot
 from frappe.website.serve import get_response
 
-local_manager = LocalManager([frappe.local])
+local_manager = LocalManager(frappe.local)
 
 _site = None
 _sites_path = os.environ.get("SITES_PATH", ".")
@@ -44,6 +44,7 @@ class RequestContext:
 		frappe.destroy()
 
 
+@local_manager.middleware
 @Request.application
 def application(request):
 	response = None
@@ -313,9 +314,6 @@ def after_request(rollback):
 	return rollback
 
 
-application = local_manager.make_middleware(application)
-
-
 def serve(
 	port=8000, profile=False, no_reload=False, no_threading=False, site=None, sites_path="."
 ):