diff --git a/packages/next/types/index.d.ts b/packages/next/types/index.d.ts
index 25b63fe2553316..e679a2989cc58b 100644
--- a/packages/next/types/index.d.ts
+++ b/packages/next/types/index.d.ts
@@ -125,12 +125,8 @@ export type GetStaticProps<
   context: GetStaticPropsContext<Q, D>
 ) => Promise<GetStaticPropsResult<P>> | GetStaticPropsResult<P>
 
-export type InferGetStaticPropsType<T> = T extends GetStaticProps<infer P, any>
-  ? P
-  : T extends (
-      context?: GetStaticPropsContext<any>
-    ) => Promise<GetStaticPropsResult<infer P>> | GetStaticPropsResult<infer P>
-  ? P
+export type InferGetStaticPropsType<T> = T extends GetStaticProps
+  ? Extract<Awaited<ReturnType<T>>, { props: any }>['props']
   : never
 
 export type GetStaticPathsContext = {
@@ -178,15 +174,10 @@ export type GetServerSideProps<
   context: GetServerSidePropsContext<Q, D>
 ) => Promise<GetServerSidePropsResult<P>>
 
-export type InferGetServerSidePropsType<T> = T extends GetServerSideProps<
-  infer P,
-  any
->
-  ? P
-  : T extends (
-      context?: GetServerSidePropsContext<any>
-    ) => Promise<GetServerSidePropsResult<infer P>>
-  ? P
+type Filter<T, U> = T extends U ? T : never
+
+export type InferGetServerSidePropsType<T> = T extends GetServerSideProps
+  ? Extract<Awaited<ReturnType<T>>, { props: any }>['props']
   : never
 
 declare global {