diff --git a/frappe/app.py b/frappe/app.py
index 5b6eead1c2e..0f2f3b48b46 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -79,7 +79,6 @@ def application(environ, start_response):
 			app(environ, start_response),
 			(
 				frappe.rate_limiter.update,
-				frappe.monitor.stop,
 				frappe.recorder.dump,
 				frappe.request.after_response.run,
 				frappe.destroy,
diff --git a/frappe/hooks.py b/frappe/hooks.py
index 46011dc3437..005cb781feb 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -423,6 +423,10 @@
 	"frappe.rate_limiter.apply",
 ]
 
+after_request = [
+	"frappe.monitor.stop",
+]
+
 # Background Job Hooks
 before_job = [
 	"frappe.recorder.record",
diff --git a/frappe/tests/test_perf.py b/frappe/tests/test_perf.py
index 98ab0453f62..09f4193f262 100644
--- a/frappe/tests/test_perf.py
+++ b/frappe/tests/test_perf.py
@@ -217,7 +217,7 @@ class TestOverheadCalls(FrappeAPITestCase):
 
 	def test_ping_overheads(self):
 		self.get(self.method("ping"), {"sid": "Guest"})
-		with self.assertRedisCallCounts(12), self.assertQueryCount(self.BASE_SQL_CALLS):
+		with self.assertRedisCallCounts(13), self.assertQueryCount(self.BASE_SQL_CALLS):
 			self.get(self.method("ping"), {"sid": "Guest"})
 
 	def test_list_view_overheads(self):