diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js
index 1675d3e..8e86dbe 100644
--- a/src/components/FiDataGrid.js
+++ b/src/components/FiDataGrid.js
@@ -40,7 +40,10 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
     const [rowCount, setRowCount] = React.useState(0);
     const [myHideFooterSelectedRowCount, setMyHideFooterSelectedRowCount] = React.useState(true);
    
-    React.useMemo(() => { set_doLoad(doLoad); }, [doLoad]);
+    React.useEffect(() => { 
+        setPage(0);
+        set_doLoad(doLoad); 
+    }, [doLoad]);
 
     React.useEffect(()=>{
         getDataList();
diff --git a/src/pages/PublicNotice/ListPanel/BaseGrid.js b/src/pages/PublicNotice/ListPanel/BaseGrid.js
index 6218fe3..7206aa2 100644
--- a/src/pages/PublicNotice/ListPanel/BaseGrid.js
+++ b/src/pages/PublicNotice/ListPanel/BaseGrid.js
@@ -109,7 +109,7 @@ export default function BaseGrid({setCount, url}) {
                     callback:(responseData)=>{
                         setCount(responseData.count??0);
                     }
-                }))}
+                }), [url])}
             />
         </div>
     );
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index e2f3c92..343a185 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -332,7 +332,7 @@ export default function SubmittedTab({ setCount, url }) {
                             setCount(responseData?.count ?? 0);
                             setRowList(responseData?.records);
                         }
-                    }))}
+                    }),[url, _searchCriteria])}
                 />
 
                 <ThemeProvider theme={PNSPS_BUTTON_THEME}>