diff --git a/src/__tests__/index.browser.js b/src/__tests__/index.browser.js
index 20aebcd..f042d7d 100644
--- a/src/__tests__/index.browser.js
+++ b/src/__tests__/index.browser.js
@@ -106,6 +106,83 @@ test('browser plugin integration test withRPCRedux', async t => {
   t.end();
 });
 
+test('browser plugin integration test withRPCRedux and options', async t => {
+  setup();
+  const fetch = (url, options) => {
+    if (!options || !options.body || typeof options.body !== 'string') {
+      throw new Error(`Expected a string from options.body`);
+    }
+    const body: string = options.body;
+
+    t.equal(url, '/api/test', 'fetches to expected url');
+    t.deepLooseEqual(
+      JSON.parse(body),
+      {arg: 1, state: 2, prop: 3},
+      'sends correct body'
+    );
+    t.equal(options.method, 'POST', 'makes POST request');
+    return Promise.resolve(
+      new Response(
+        JSON.stringify({
+          status: 'success',
+          data: {
+            a: 'b',
+          },
+        })
+      )
+    );
+  };
+
+  const expectedActions = [
+    {type: initActionPattern},
+    {type: /TEST_START/, payload: {arg: 1, state: 2, prop: 3}},
+    {type: /TEST_SUCCESS/, payload: {a: 'b'}},
+  ];
+  const store = createStore(
+    (state, action) => {
+      const fixture = expectedActions.shift();
+      t.ok(fixture.type.test(action.type), 'dispatches expected action type');
+      t.deepLooseEqual(
+        action.payload,
+        // $FlowFixMe
+        fixture.payload,
+        'dispatches expected action payload'
+      );
+      return {...state, ...action.payload};
+    },
+    {state: 2}
+  );
+
+  const Component = props => {
+    t.equal(typeof props.test, 'function', 'passes correct prop to component');
+    return React.createElement('span', null, 'hello world');
+  };
+
+  const mapStateToParams = (state, args, props) => {
+    return {...state, ...args, ...props};
+  };
+
+  const withTest = compose(
+    withRPCRedux('test', {mapStateToParams}),
+    connect(s => s),
+    prepared(props => (props.a ? Promise.resolve() : props.test({arg: 1})))
+  )(Component);
+
+  const element = React.createElement(
+    Provider,
+    {store},
+    React.createElement(withTest, {prop: 3})
+  );
+  const app = new App(element);
+  app.register(Plugin);
+  app.register(FetchToken, fetch);
+  await getSimulator(app).render('/');
+  t.equal(expectedActions.length, 0, 'dispatches all actions');
+
+  teardown();
+  t.end();
+});
+
 test('browser plugin integration test withRPCRedux - failure', async t => {
   setup();
   const fetch = (url, options) => {
diff --git a/src/hoc.js b/src/hoc.js
index 19026e8..db814bf 100644
--- a/src/hoc.js
+++ b/src/hoc.js
@@ -26,7 +26,7 @@ export const withRPCReactor = (
   }: {
     propName?: string,
     transformParams?: (params: any) => any,
-    mapStateToParams?: (state: any) => any,
+    mapStateToParams?: (state: any, args?: any, ownProps?: any) => any,
   } = {}
 ) => {
   return withRPCRedux(rpcId, {
@@ -49,7 +49,7 @@ export function withRPCRedux(
     propName?: string,
     actions?: any,
     transformParams?: (params: any) => any,
-    mapStateToParams?: (state: any) => any,
+    mapStateToParams?: (state: any, args?: any, ownProps?: any) => any,
   } = {}
 ): (React.ComponentType<*>) => React.ComponentType<*> {
   if (!propName) {
@@ -59,6 +59,10 @@ export function withRPCRedux(
     class withRPCRedux extends React.Component<*, *> {
       render() {
         const {rpc, store} = this.context;
+        if (mapStateToParams) {
+          const mapState = mapStateToParams;
+          mapStateToParams = (state, args) => mapState(state, args, this.props);
+        }
         const handler = createRPCHandler({
           rpcId,
           rpc,