diff --git a/frontend/src/pages/Base.tsx b/frontend/src/pages/Base.tsx
index 611f45cd..6a3d959b 100644
--- a/frontend/src/pages/Base.tsx
+++ b/frontend/src/pages/Base.tsx
@@ -80,7 +80,11 @@ const Base = () => {
   useEffect(() => {
     if (currentPageFromUrl !== currentPage) {
       setSearchParams(params => {
-        params.set('page', currentPage.toString());
+        if (currentPage == 0) {
+          params.delete('page');
+        } else {
+          params.set('page', currentPage.toString());
+        }
 
         return params;
       });
diff --git a/frontend/src/pages/Download.tsx b/frontend/src/pages/Download.tsx
index b4e1b688..4fc06d28 100644
--- a/frontend/src/pages/Download.tsx
+++ b/frontend/src/pages/Download.tsx
@@ -117,7 +117,11 @@ const Download = () => {
     })();
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [refresh, showIgnored, currentPage]);
+  }, [refresh]);
+
+  useEffect(() => {
+    setRefresh(true);
+  }, [channelFilterFromUrl, currentPage, showIgnored]);
 
   useEffect(() => {
     (async () => {
@@ -127,10 +131,6 @@ const Download = () => {
     })();
   }, [lastVideoCount, showIgnored]);
 
-  useEffect(() => {
-    setRefresh(true);
-  }, [channelFilterFromUrl]);
-
   return (
     <>
       <title>TA | Downloads</title>
@@ -262,7 +262,7 @@ const Download = () => {
 
                   const params = searchParams;
                   if (value !== 'all') {
-                    params.append('channel', value);
+                    params.set('channel', value);
                   } else {
                     params.delete('channel');
                   }