diff --git a/frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx b/frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx
index 1c73ad41ad..86944020b6 100644
--- a/frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx
+++ b/frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx
@@ -149,12 +149,20 @@ const SiteTopNav = ({
         ? navItem.location.pathname
         : currentPath;
 
+      const includeTeamId = (activePath: string) => {
+        if (currentQueryParams.team_id) {
+          return `${path}?team_id=${currentQueryParams.team_id}`;
+        }
+        return activePath;
+      };
+
       // Clicking an active link returns user to default page
+      // Resetting all filters except team ID
       // TODO: Find best pattern(one that doesn't dispatch a
       // replace to the same url, which triggers a re-render)
       return (
         <li className={navItemClasses} key={`nav-item-${name}`}>
-          <a className={`${navItemBaseClass}__link`} href={path}>
+          <a className={`${navItemBaseClass}__link`} href={includeTeamId(path)}>
             <span
               className={`${navItemBaseClass}__name`}
               data-text={navItem.name}