diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5eb99d998a..62751be855 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Added
 - Add lazy create cart token - @gibkigonzo (#3994)
+- Add server context to async data loader - @gibkigonzo (pr#4113)
 
 ### Fixed
 - Fix low-quality images styles - @przspa (#3906)
diff --git a/core/server-entry.ts b/core/server-entry.ts
index 5a03915503..5cae194415 100755
--- a/core/server-entry.ts
+++ b/core/server-entry.ts
@@ -31,7 +31,7 @@ function _ssrHydrateSubcomponents (components, store, router, resolve, reject, a
       return Promise.resolve(null)
     }
   })).then(() => {
-    AsyncDataLoader.flush({ store, route: router.currentRoute, context: null } /* AsyncDataLoaderActionContext */).then((r) => {
+    AsyncDataLoader.flush({ store, route: router.currentRoute, context } /* AsyncDataLoaderActionContext */).then((r) => {
       if (buildTimeConfig.ssr.useInitialStateFilter) {
         context.state = omit(store.state, config.ssr.initialStateFilter)
       } else {