diff --git a/src/pages/Payment/MultiPaymentWindow.js b/src/pages/Payment/MultiPaymentWindow.js
index 976e281..c72e212 100644
--- a/src/pages/Payment/MultiPaymentWindow.js
+++ b/src/pages/Payment/MultiPaymentWindow.js
@@ -217,8 +217,10 @@ const MultiPaymentWindow = (props) => {
             });
             const latestDataObjects = Object.values(latestData);
             
-            // const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
-            const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
+            const filteredData = latestDataObjects.filter(item =>
+                item.status == "CANC" || item.status == "REJT"
+                || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
+            );
 
             const filteredAppIds = filteredData.map(item => item.appId);
             
diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js
index ad673ed..0c2d744 100644
--- a/src/pages/Proof/Payment/Pay.js
+++ b/src/pages/Proof/Payment/Pay.js
@@ -62,8 +62,10 @@ const Index = ({ record }) => {
                 });
                 const latestDataObjects = Object.values(latestData);
                 
-                // const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
+                const filteredData = latestDataObjects.filter(item =>
+                    item.status == "CANC" || item.status == "REJT"
+                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
+                );
 
                 const filteredAppIds = filteredData.map(item => item.appId);
 
diff --git a/src/pages/Proof/Payment/Pay_Online.js b/src/pages/Proof/Payment/Pay_Online.js
index 3358299..546353c 100644
--- a/src/pages/Proof/Payment/Pay_Online.js
+++ b/src/pages/Proof/Payment/Pay_Online.js
@@ -140,7 +140,10 @@ const Index = () => {
                 });
                 const latestDataObjects = Object.values(latestData);
 
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status !== "APPR");
+                const filteredData = latestDataObjects.filter(item =>
+                    item.status == "CANC" || item.status == "REJT"
+                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
+                );
                 const filteredAppIds = filteredData.map(item => item.appId);
 
                 const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));
diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index e8b5006..0597d5b 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -156,8 +156,10 @@ const ApplicationDetailCard = (
                 });
                 const latestDataObjects = Object.values(latestData);
 
-                // const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
+                const filteredData = latestDataObjects.filter(item =>
+                    item.status == "CANC" || item.status == "REJT"
+                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
+                );
 
                 const filteredAppIds = filteredData.map(item => item.appId);
 
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index af6677f..da7e488 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -151,7 +151,10 @@ export default function SubmittedTab({ setCount, url }) {
                 });
                 const latestDataObjects = Object.values(latestData);
                 
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
+                const filteredData = latestDataObjects.filter(item =>
+                    item.status == "CANC" || item.status == "REJT"
+                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
+                );
                 const filteredAppIds = filteredData.map(item => item.appId);
 
                 const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));