diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index 0c7b9089c6..0c893486c3 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -141,7 +141,7 @@ declare module 'recompose' {
         stateUpdaterName: TStateUpdaterName,
         initialState: TState | mapper<TOutter, TState>
     ): InferableComponentEnhancerWithProps<
-        stateProps<TState, TStateName, TStateUpdaterName>,
+        TOutter & stateProps<TState, TStateName, TStateUpdaterName>,
         TOutter
     >;
 
diff --git a/types/recompose/recompose-tests.tsx b/types/recompose/recompose-tests.tsx
index 75d64b468d..c30f5fb8f9 100644
--- a/types/recompose/recompose-tests.tsx
+++ b/types/recompose/recompose-tests.tsx
@@ -256,6 +256,15 @@ function testWithState() {
     const rendered2 = (
         <Enhanced2 title="foo" />
     );
+
+    // We can also actually provide the generic necessary
+    const enhancer3 = withState<OutterProps, number, "count", "setCount">("count", "setCount", 1);
+    const Enhanced3 = enhancer3(props => {
+        return <div>{props.title}</div>; 
+    });
+    const rendered3 = (
+        <Enhanced3 title="foo" />
+    );
 }
 
 function testWithStateHandlers() {