diff --git a/types/next/app.d.ts b/types/next/app.d.ts
index e086af0ca8..d077c0e95a 100644
--- a/types/next/app.d.ts
+++ b/types/next/app.d.ts
@@ -1,19 +1,19 @@
 import * as React from "react";
 import { NextContext } from ".";
-import { RouterProps } from "./router";
+import { RouterProps, DefaultQuery } from "./router";
 
-export interface AppComponentProps {
+export interface AppComponentProps<Q = DefaultQuery> {
     Component: React.ComponentType<any>;
-    router: RouterProps;
+    router: RouterProps<Q>;
     pageProps: any;
 }
 
-export interface AppComponentContext {
+export interface AppComponentContext<Q = DefaultQuery> {
     Component: React.ComponentType<any>;
-    router: RouterProps;
-    ctx: NextContext;
+    router: RouterProps<Q>;
+    ctx: NextContext<Q>;
 }
 
-export class Container extends React.Component {}
+export class Container extends React.Component { }
 
-export default class App<TProps = {}> extends React.Component<TProps & AppComponentProps> {}
+export default class App<TProps = {}, Q = DefaultQuery> extends React.Component<TProps & AppComponentProps<Q>> { }
diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index af4d26aa7f..71d769ed31 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -43,10 +43,10 @@ declare namespace next {
         isServer?: boolean;
     }
 
-    type NextSFC<TProps = {}> = NextStatelessComponent<TProps>;
-    interface NextStatelessComponent<TProps = {}>
+    type NextSFC<TProps = {}, Q = QueryStringMapObject> = NextStatelessComponent<TProps, Q>;
+    interface NextStatelessComponent<TProps = {}, Q = QueryStringMapObject>
         extends React.StatelessComponent<TProps> {
-        getInitialProps?: (ctx: NextContext) => Promise<TProps>;
+        getInitialProps?: (ctx: NextContext<Q>) => Promise<TProps>;
     }
 
     type UrlLike = url.UrlObject | url.Url;
diff --git a/types/next/router.d.ts b/types/next/router.d.ts
index 2b019625f6..be3665e3d5 100644
--- a/types/next/router.d.ts
+++ b/types/next/router.d.ts
@@ -26,7 +26,7 @@ export type PopStateCallback = (state: any) => boolean | undefined;
 
 export type RouterCallback = () => void;
 
-interface DefaultQuery {
+export interface DefaultQuery {
     [key: string]:
     | boolean
     | boolean[]