diff --git a/packages/nova-routing/lib/server/routing.jsx b/packages/nova-routing/lib/server/routing.jsx
index da3c6bf67..f7c8f69f5 100644
--- a/packages/nova-routing/lib/server/routing.jsx
+++ b/packages/nova-routing/lib/server/routing.jsx
@@ -36,12 +36,15 @@ Meteor.startup(() => {
   const options = {
     historyHook(req, res, newHistory) {
       req.history = newHistory;
-      const context = renderContext.get();
-      context.history = req.history;
+      // patch: renderContext doesn't get the values assigned from req
+      // const context = renderContext.get();
+      // context.history = req.history;
       return req.history;
     },
     wrapperHook(req, res, appGenerator) {
-      const { apolloClient, store } = renderContext.get();
+      // patch: renderContext doesn't get the values assigned from req
+      // const { apolloClient, store } = renderContext.get();
+      const { apolloClient, store } = req;
       const app = appGenerator();
       return <ApolloProvider store={store} client={apolloClient}>{app}</ApolloProvider>;
     },
@@ -49,8 +52,10 @@ Meteor.startup(() => {
       return Promise.await(getDataFromTree(app));
     },
     dehydrateHook(req, res) {
-      const context = renderContext.get();
-      return context.apolloClient.store.getState();
+      // patch: renderContext doesn't get the values assigned from req
+      // const context = renderContext.get();
+      // return context.apolloClient.store.getState();
+      return req.apolloClient.store.getState();
     },
     postRender(req, res) {
       // req.css = styleSheet.sheet ? styleSheet.rules().map(rule => rule.cssText).join('\n') : '';