diff --git a/src/index.d.ts b/src/index.d.ts
index 90affcc87..a8a6d9279 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -2,6 +2,7 @@ import i18next, { ReactOptions, i18n, ThirdPartyModule, WithT, TFunction, Resour
 import * as React from 'react';
 
 type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
+type Subtract<T extends K, K> = Omit<T, keyof K>;
 
 export type Namespace = string | string[];
 
@@ -92,9 +93,15 @@ export function withTranslation(
   options?: {
     withRef?: boolean;
   },
-): <P extends WithTranslation>(
-  component: React.ComponentType<P>,
-) => React.ComponentType<Omit<P, keyof WithTranslation> & WithTranslationProps>;
+): <
+  C extends React.ComponentType<React.ComponentProps<C> & WithTranslationProps>,
+  ResolvedProps = JSX.LibraryManagedAttributes<
+    C,
+    Subtract<React.ComponentProps<C>, WithTranslationProps>
+  >
+>(
+  component: C,
+) => React.ComponentType<Omit<ResolvedProps, keyof WithTranslation> & WithTranslationProps>;
 
 export interface I18nextProviderProps {
   i18n: i18n;
diff --git a/src/ts4.1/index.d.ts b/src/ts4.1/index.d.ts
index a9a5f9a4a..cbd3559a6 100644
--- a/src/ts4.1/index.d.ts
+++ b/src/ts4.1/index.d.ts
@@ -9,6 +9,8 @@ import i18next, {
 } from 'i18next';
 import * as React from 'react';
 
+type Subtract<T extends K, K> = Omit<T, keyof K>;
+
 /**
  * This interface can be augmented by users to add types to `react-i18next` default resources.
  */
@@ -176,9 +178,15 @@ export function withTranslation<N extends Namespace = DefaultNamespace>(
   options?: {
     withRef?: boolean;
   },
-): <P extends WithTranslation<N>>(
-  component: React.ComponentType<P>,
-) => React.ComponentType<Omit<P, keyof WithTranslation<N>> & WithTranslationProps>;
+): <
+  C extends React.ComponentType<React.ComponentProps<C> & WithTranslationProps>,
+  ResolvedProps = JSX.LibraryManagedAttributes<
+    C,
+    Subtract<React.ComponentProps<C>, WithTranslationProps>
+  >
+>(
+  component: C,
+) => React.ComponentType<Omit<ResolvedProps, keyof WithTranslation<N>> & WithTranslationProps>;
 
 export interface I18nextProviderProps {
   i18n: i18n;
diff --git a/test/typescript/withTranslation.test.tsx b/test/typescript/withTranslation.test.tsx
index f0af576d1..f2b7476a9 100644
--- a/test/typescript/withTranslation.test.tsx
+++ b/test/typescript/withTranslation.test.tsx
@@ -10,18 +10,29 @@ interface MyComponentProps extends WithTranslation {
   bar: 'baz';
 }
 
+const defaultProps: Partial<MyComponentProps> = {
+  bar: 'baz',
+};
+
 const MyComponent = (props: MyComponentProps) => {
   const { t, i18n, tReady } = props;
   const r: boolean = tReady;
   return <h2>{t('title')}</h2>;
 };
 
+MyComponent.defaultProps = defaultProps;
+
 // page uses the hook
 function defaultUsage() {
   const ExtendedComponent = withTranslation()(MyComponent);
   return <ExtendedComponent bar="baz" />;
 }
 
+function defaultUsageWithDefaultProps() {
+  const ExtendedComponent = withTranslation()(MyComponent);
+  return <ExtendedComponent />;
+}
+
 /**
  * @see https://react.i18next.com/latest/withtranslation-hoc#withtranslation-params
  */