404 when there are less products then products per page

Hi,
Really like your plugin. We came across an issue last week. In your documentation you mention to use the plugin ‘WooCommerce Products Per Page’ for the products per page. On the site we get a 404 when there are less products available then products per page is put on. In the steps below I’ll describe how to get to the 404:
– On a page there are 33 products visible. Only 20 products show, because that is the standard number of products visible.
– You go to page 2.
– You decide to change the products per page from 20 (standard) to 40, because you want to see all, then you get a 404.

Do you know how to fix this?

The page I need help with: [log in to see the link]