diff --git a/types/react-router-config/index.d.ts b/types/react-router-config/index.d.ts
index 8497b0d4b8..2040a8a721 100644
--- a/types/react-router-config/index.d.ts
+++ b/types/react-router-config/index.d.ts
@@ -14,7 +14,7 @@ export interface RouteConfigComponentProps<T> extends RouteComponentProps<T> {
 
 export interface RouteConfig {
     location?: Location;
-    component?: React.SFC<RouteConfigComponentProps<any> | void> | React.ComponentClass<RouteConfigComponentProps<any> | void>;
+    component?: React.ComponentType<RouteConfigComponentProps<any> | {}>;
     path?: string;
     exact?: boolean;
     strict?: boolean;
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 5d97ebb71f..82811fadfb 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -64,7 +64,7 @@ export interface RouteComponentProps<P> {
 
 export interface RouteProps {
   location?: H.Location;
-  component?: React.SFC<RouteComponentProps<any> | undefined> | React.ComponentClass<RouteComponentProps<any> | undefined>;
+  component?: React.ComponentType<RouteComponentProps<any> | {}>;
   render?: ((props: RouteComponentProps<any>) => React.ReactNode);
   children?: ((props: RouteComponentProps<any>) => React.ReactNode) | React.ReactNode;
   path?: string;
@@ -99,4 +99,4 @@ export interface match<P> {
 }
 
 export function matchPath<P>(pathname: string, props: RouteProps): match<P> | null;
-export function withRouter<P>(component: React.SFC<RouteComponentProps<any> & P> | React.ComponentClass<RouteComponentProps<any> & P>): React.ComponentClass<P>;
+export function withRouter<P>(component: React.ComponentType<RouteComponentProps<any> & P>): React.ComponentClass<P>;
diff --git a/types/react-router/test/examples-from-react-router-website/PreventingTransitions.tsx b/types/react-router/test/examples-from-react-router-website/PreventingTransitions.tsx
index bd5d76ae2b..9f1858c89f 100644
--- a/types/react-router/test/examples-from-react-router-website/PreventingTransitions.tsx
+++ b/types/react-router/test/examples-from-react-router-website/PreventingTransitions.tsx
@@ -22,7 +22,7 @@ const PreventingTransitionsExample = () => (
   </Router>
 );
 
-class Form extends React.Component<undefined, {isBlocking: boolean}> {
+class Form extends React.Component<{}, {isBlocking: boolean}> {
   state = {
     isBlocking: false
   };
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index ab25ae8908..df4a9f5374 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -36,7 +36,7 @@ declare namespace React {
     // ----------------------------------------------------------------------
 
     type ReactType = string | ComponentType<any>;
-    type ComponentType<P> = ComponentClass<P> | StatelessComponent<P>;
+    type ComponentType<P = {}> = ComponentClass<P> | StatelessComponent<P>;
 
     type Key = string | number;
     type Ref<T> = string | ((instance: T | null) => any);
diff --git a/types/rrc/index.d.ts b/types/rrc/index.d.ts
index 6a56baf3fc..f4ef84e568 100644
--- a/types/rrc/index.d.ts
+++ b/types/rrc/index.d.ts
@@ -22,10 +22,10 @@ export interface WithScrollOptions {
     alignToTop?: boolean;
 }
 
-export type ComponentConstructor<Props> = React.ComponentClass<Props> | React.SFC<Props>;
+export type ComponentConstructor<Props> = React.ComponentType<Props>;
 
-export function withScroll(component: ComponentConstructor<RouteComponentProps<any> | undefined>, options?: WithScrollOptions)
-    : ComponentConstructor<RouteComponentProps<any> | undefined>;
+export function withScroll(component: ComponentConstructor<RouteComponentProps<any> | {}>, options?: WithScrollOptions)
+    : ComponentConstructor<RouteComponentProps<any> | {}>;
 
 export type RouteConfiguration = RouteProps & { inject?: { [key: string]: any } };