diff --git a/web/src/BaseListPage.js b/web/src/BaseListPage.js
index ecc19394..962f8292 100644
--- a/web/src/BaseListPage.js
+++ b/web/src/BaseListPage.js
@@ -42,10 +42,11 @@ class BaseListPage extends React.Component {
   handleOrganizationChange = () => {
     this.setState({
       organizationName: this.props.match?.params.organizationName || Setting.getRequestOrganization(this.props.account),
+    },
+    () => {
+      const {pagination} = this.state;
+      this.fetch({pagination});
     });
-
-    const {pagination} = this.state;
-    this.fetch({pagination});
   };
 
   handleTourChange = () => {