diff --git a/packages/next/pages/_app.tsx b/packages/next/pages/_app.tsx
index adb9e94223c32cb32501e65e4997b818e4435f60..8280827e8a30ccca3633e0f7877a920b65cef41b 100644
--- a/packages/next/pages/_app.tsx
+++ b/packages/next/pages/_app.tsx
@@ -27,8 +27,9 @@ async function appGetInitialProps({
   return { pageProps }
 }
 
-export default class App<P = {}, CP = {}> extends React.Component<
-  P & AppProps<CP>
+export default class App<P = {}, CP = {}, S = {}> extends React.Component<
+  P & AppProps<CP>,
+  S
 > {
   static childContextTypes = {
     router: PropTypes.object,
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index 96e0cb5bc26a1f2119d3800e44c8718efe53b7f9..d0b7029a09857ddc35b04c9037cd3e0adeb6cf5e 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -58,7 +58,7 @@ export default class Document<P = {}> extends Component<DocumentProps & P> {
   }
 
   /**
-   * `getInitialProps` hook returns the context object with the addition of `renderPage`. `
+   * `getInitialProps` hook returns the context object with the addition of `renderPage`.
    * `renderPage` callback executes `React` rendering logic synchronously to support server-rendering wrappers
    */
   static async getInitialProps({