diff --git a/examples/with-apollo/lib/with-apollo-client.js b/examples/with-apollo/lib/with-apollo-client.js
index 8274678b..ab3d1a19 100644
--- a/examples/with-apollo/lib/with-apollo-client.js
+++ b/examples/with-apollo/lib/with-apollo-client.js
@@ -18,32 +18,34 @@ export default (App) => {
       // Run all GraphQL queries in the component tree
       // and extract the resulting data
       const apollo = initApollo()
-      try {
-        // Run all GraphQL queries
-        await getDataFromTree(
-          <App
-            {...appProps}
-            Component={Component}
-            router={router}
-            apolloState={apolloState}
-            apolloClient={apollo}
-          />
-        )
-      } catch (error) {
-        // Prevent Apollo Client GraphQL errors from crashing SSR.
-        // Handle them in components via the data.error prop:
-        // http://dev.apollodata.com/react/api-queries.html#graphql-query-data-error
-        console.error('Error while running `getDataFromTree`', error)
-      }
-
       if (!process.browser) {
+        try {
+          // Run all GraphQL queries
+          await getDataFromTree(
+            <App
+              {...appProps}
+              Component={Component}
+              router={router}
+              apolloState={apolloState}
+              apolloClient={apollo}
+            />
+          )
+        } catch (error) {
+          // Prevent Apollo Client GraphQL errors from crashing SSR.
+          // Handle them in components via the data.error prop:
+          // http://dev.apollodata.com/react/api-queries.html#graphql-query-data-error
+          console.error('Error while running `getDataFromTree`', error)
+        }
+
         // getDataFromTree does not call componentWillUnmount
         // head side effect therefore need to be cleared manually
         Head.rewind()
-      }
 
-      // Extract query data from the Apollo store
-      apolloState.data = apollo.cache.extract()
+        // Extract query data from the Apollo store
+        apolloState.data = apollo.cache.extract()
+      } else {
+        apolloState.data = {}
+      }
 
       return {
         ...appProps,
@@ -53,9 +55,7 @@ export default (App) => {
 
     constructor (props) {
       super(props)
-      // `getDataFromTree` renders the component first, the client is passed off as a property.
-      // After that rendering is done using Next's normal rendering pipeline
-      this.apolloClient = props.apolloClient || initApollo(props.apolloState.data)
+      this.apolloClient = initApollo(props.apolloState.data)
     }
 
     render () {