diff --git a/app/addons/documents/__tests__/query-options.test.js b/app/addons/documents/__tests__/query-options.test.js
index fec4533de..fc6c6bade 100644
--- a/app/addons/documents/__tests__/query-options.test.js
+++ b/app/addons/documents/__tests__/query-options.test.js
@@ -68,7 +68,7 @@ describe('QueryOptions', () => {
     expect(spy.calledOnce).toBe(true);
   });
 
-  it('calls queryOptionsFilterOnlyDdocs if ddocsOnly switches to true on new props', () => {
+  it('calls resetState and queryOptionsFilterOnlyDdocs if ddocsOnly switches to true on new props', () => {
     const spy = sinon.spy();
     const queryOptionsParams = {
       include_docs: false
@@ -76,6 +76,7 @@ describe('QueryOptions', () => {
 
     const wrapper = shallow(<QueryOptions
       ddocsOnly={false}
+      resetState={spy}
       queryOptionsFilterOnlyDdocs={spy}
       queryOptionsExecute={() => {}}
       resetPagination={() => {}}
@@ -89,7 +90,7 @@ describe('QueryOptions', () => {
     wrapper.instance().componentWillReceiveProps({
       ddocsOnly: true
     });
-    expect(spy.calledOnce).toBe(true);
+    expect(spy.calledTwice).toBe(true);
   });
 
   it('calls resetState if ddocsOnly switches to false on new props', () => {
diff --git a/app/addons/documents/index-results/components/queryoptions/QueryOptions.js b/app/addons/documents/index-results/components/queryoptions/QueryOptions.js
index 7d8b9630b..0c8058cac 100644
--- a/app/addons/documents/index-results/components/queryoptions/QueryOptions.js
+++ b/app/addons/documents/index-results/components/queryoptions/QueryOptions.js
@@ -42,6 +42,7 @@ export default class QueryOptions extends React.Component {
     } = this.props;
 
     if (!ddocsOnly && nextProps.ddocsOnly) {
+      resetState();
       queryOptionsFilterOnlyDdocs();
     } else if (ddocsOnly && !nextProps.ddocsOnly) {
       resetState();