diff --git a/packages/components/src/types.ts b/packages/components/src/types.ts
index f294fefe31..8da7942bd6 100644
--- a/packages/components/src/types.ts
+++ b/packages/components/src/types.ts
@@ -14,7 +14,7 @@ export interface QueryComponentOptions<
   TData = any,
   TVariables = OperationVariables
 > extends QueryFunctionOptions<TData, TVariables> {
-  children: (result: QueryResult<TData, TVariables>) => JSX.Element | null;
+  children: (result: QueryResult<TData, TVariables>) => React.ReactNode
   query: DocumentNode;
 }
 
@@ -32,7 +32,7 @@ export interface MutationComponentOptions<
 export interface SubscriptionComponentOptions<
   TData = any,
   TVariables = OperationVariables
-> extends BaseSubscriptionOptions<TData, TVariables> {
+  > extends BaseSubscriptionOptions<TData, TVariables> {
   subscription: DocumentNode;
   children?: null | ((result: SubscriptionResult<TData>) => JSX.Element | null);
 }
diff --git a/packages/hoc/src/withApollo.tsx b/packages/hoc/src/withApollo.tsx
index ce32741b40..6acd433604 100644
--- a/packages/hoc/src/withApollo.tsx
+++ b/packages/hoc/src/withApollo.tsx
@@ -9,10 +9,8 @@ function getDisplayName<P>(WrappedComponent: React.ComponentType<P>) {
   return WrappedComponent.displayName || WrappedComponent.name || 'Component';
 }
 
-export function withApollo<TProps, TResult = any>(
-  WrappedComponent: React.ComponentType<
-    WithApolloClient<Omit<TProps, 'client'>>
-  >,
+export function withApollo<TProps extends WithApolloClient<{}>, TResult = any>(
+  WrappedComponent: React.ComponentType<TProps>,
   operationOptions: OperationOption<TProps, TResult> = {}
 ): React.ComponentClass<Omit<TProps, 'client'>> {
   const withDisplayName = `withApollo(${getDisplayName(WrappedComponent)})`;
@@ -53,7 +51,7 @@ export function withApollo<TProps, TResult = any>(
                 ? this.setWrappedInstance
                 : undefined
             });
-            return <WrappedComponent {...props} />;
+            return <WrappedComponent {...props as any} />;
           }}
         </ApolloConsumer>
       );