diff --git a/ui/component/claimListDiscover/view.jsx b/ui/component/claimListDiscover/view.jsx
index a4fe4cff1..97d8f6551 100644
--- a/ui/component/claimListDiscover/view.jsx
+++ b/ui/component/claimListDiscover/view.jsx
@@ -103,7 +103,7 @@ function ClaimListDiscover(props: Props) {
   const [page, setPage] = useState(1);
   const [forceRefresh, setForceRefresh] = useState();
   const [expanded, setExpanded] = usePersistedState(`expanded-${location.pathname}`, false);
-  const [orderParamEntry, setOrderParamEntry] = useState(CS.ORDER_BY_TRENDING);
+  const [orderParamEntry, setOrderParamEntry] = usePersistedState(`entry-${location.pathname}`, CS.ORDER_BY_TRENDING);
   const [orderParamUser, setOrderParamUser] = usePersistedState(`orderUser-${location.pathname}`, CS.ORDER_BY_TRENDING);
   const followed = (followedTags && followedTags.map(t => t.name)) || [];
   const urlParams = new URLSearchParams(search);
@@ -155,7 +155,9 @@ function ClaimListDiscover(props: Props) {
 
   useEffect(() => {
     // One-time update to stash the finalized 'orderParam' at entry.
-    setOrderParamEntry(orderParam);
+    if (history.action !== 'POP') {
+      setOrderParamEntry(orderParam);
+    }
   }, []);
 
   let options: {