diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
index e35bc8aa93d9d45a84de950aceb9375e5b3b9942..b49f832749a4eeadeeebd96c40ec6e00120e48d1 100644
--- a/packages/next/client/index.tsx
+++ b/packages/next/client/index.tsx
@@ -1,5 +1,4 @@
 /* global location */
-import type { ParsedUrlQuery } from 'querystring'
 import React from 'react'
 import ReactDOM from 'react-dom'
 import { HeadManagerContext } from '../next-server/lib/head-manager-context'
@@ -16,6 +15,7 @@ import { isDynamicRoute } from '../next-server/lib/router/utils/is-dynamic'
 import * as querystring from '../next-server/lib/router/utils/querystring'
 import * as envConfig from '../next-server/lib/runtime-config'
 import { getURL, loadGetInitialProps, ST } from '../next-server/lib/utils'
+import type { NEXT_DATA } from '../next-server/lib/utils'
 import initHeadManager from './head-manager'
 import PageLoader from './page-loader'
 import measureWebVitals from './performance-relayer'
@@ -33,20 +33,7 @@ declare global {
 
     /* prod */
     __NEXT_PRELOADREADY?: (ids?: string[]) => void
-
-    __NEXT_DATA__: {
-      props: Record<string, any>
-      err?: Error
-      page: string
-      query: ParsedUrlQuery
-      buildId: string
-      assetPrefix?: string
-      runtimeConfig?: object
-      dynamicIds?: string[]
-      isFallback?: boolean
-      nextExport?: boolean
-    }
-
+    __NEXT_DATA__: NEXT_DATA
     __NEXT_P: any[]
   }
 }
diff --git a/packages/next/next-server/lib/utils.ts b/packages/next/next-server/lib/utils.ts
index 7df5e91165e0029bae55187f74cc3468604980a5..fcb01d37438c287f09ff46d58dddab4d7ef627a3 100644
--- a/packages/next/next-server/lib/utils.ts
+++ b/packages/next/next-server/lib/utils.ts
@@ -82,7 +82,7 @@ export type BaseContext = {
 }
 
 export type NEXT_DATA = {
-  props: any
+  props: Record<string, any>
   page: string
   query: ParsedUrlQuery
   buildId: string