diff --git a/lib/application.js b/lib/application.js
index cbbb24b0d..415da0862 100644
--- a/lib/application.js
+++ b/lib/application.js
@@ -208,7 +208,7 @@ module.exports = class Application extends Emitter {
     request.response = response
     response.request = request
     context.originalUrl = request.originalUrl = req.url
-    context.state = {}
+    context.state = Object.assign({}, context.state)
     return context
   }
 
diff --git a/lib/context.js b/lib/context.js
index a02270f2f..d3f9fad5c 100644
--- a/lib/context.js
+++ b/lib/context.js
@@ -50,6 +50,7 @@ const proto = module.exports = {
       request: this.request.toJSON(),
       response: this.response.toJSON(),
       app: this.app.toJSON(),
+      state: this.state,
       originalUrl: this.originalUrl,
       req: '<original node req>',
       res: '<original node res>',