diff --git a/pages/[username].tsx b/pages/[username].tsx
index 70e1396f..56d33f73 100644
--- a/pages/[username].tsx
+++ b/pages/[username].tsx
@@ -71,7 +71,8 @@ const ProfileRoute: React.FC<Props> = ({
     recordCount,
     parties,
     setParties,
-    isFetching,
+    loaded,
+    fetching,
     setFetching,
     fetchError,
     fetch,
@@ -155,14 +156,22 @@ const ProfileRoute: React.FC<Props> = ({
   }
 
   const renderInfiniteScroll = (
-    <InfiniteScroll
-      dataLength={parties && parties.length > 0 ? parties.length : 0}
-      next={() => setCurrentPage(currentPage + 1)}
-      hasMore={totalPages > currentPage}
-      loader={renderLoading(3)}
-    >
-      <GridRepCollection>{renderParties()}</GridRepCollection>
-    </InfiniteScroll>
+    <>
+      {parties.length === 0 && !loaded && renderLoading(3)}
+      {parties.length === 0 && loaded && (
+        <div className="notFound">
+          <h2>There are no teams with your specified filters</h2>
+        </div>
+      )}
+      <InfiniteScroll
+        dataLength={parties && parties.length > 0 ? parties.length : 0}
+        next={() => setCurrentPage(currentPage + 1)}
+        hasMore={totalPages > currentPage}
+        loader={renderLoading(3)}
+      >
+        <GridRepCollection>{renderParties()}</GridRepCollection>
+      </InfiniteScroll>
+    </>
   )
 
   if (context) {
diff --git a/pages/saved.tsx b/pages/saved.tsx
index 8a71b722..18371b59 100644
--- a/pages/saved.tsx
+++ b/pages/saved.tsx
@@ -66,7 +66,8 @@ const SavedRoute: React.FC<Props> = ({
     recordCount,
     parties,
     setParties,
-    isFetching,
+    loaded,
+    fetching,
     setFetching,
     fetchError,
     fetch,
@@ -150,14 +151,22 @@ const SavedRoute: React.FC<Props> = ({
   }
 
   const renderInfiniteScroll = (
-    <InfiniteScroll
-      dataLength={parties && parties.length > 0 ? parties.length : 0}
-      next={() => setCurrentPage(currentPage + 1)}
-      hasMore={totalPages > currentPage}
-      loader={renderLoading(3)}
-    >
-      <GridRepCollection>{renderParties()}</GridRepCollection>
-    </InfiniteScroll>
+    <>
+      {parties.length === 0 && !loaded && renderLoading(3)}
+      {parties.length === 0 && loaded && (
+        <div className="notFound">
+          <h2>There are no teams with your specified filters</h2>
+        </div>
+      )}
+      <InfiniteScroll
+        dataLength={parties && parties.length > 0 ? parties.length : 0}
+        next={() => setCurrentPage(currentPage + 1)}
+        hasMore={totalPages > currentPage}
+        loader={renderLoading(3)}
+      >
+        <GridRepCollection>{renderParties()}</GridRepCollection>
+      </InfiniteScroll>
+    </>
   )
 
   if (context) {
diff --git a/pages/teams.tsx b/pages/teams.tsx
index 5b741154..0d3dbfd1 100644
--- a/pages/teams.tsx
+++ b/pages/teams.tsx
@@ -32,7 +32,6 @@ import { CollectionPage } from '~utils/enums'
 
 interface Props {
   context?: PageContextObj
-  query: { [key: string]: string }
   version: AppUpdate
   error: boolean
   status?: ResponseStatus
@@ -40,7 +39,6 @@ interface Props {
 
 const TeamsRoute: React.FC<Props> = ({
   context,
-  query,
   version,
   error,
   status,
@@ -212,7 +210,6 @@ export const getServerSideProps = async ({ req, res, locale, query }: { req: Nex
     return {
       props: {
         context: { raidGroups },
-        query,
         version,
         error: false,
         ...(await serverSideTranslations(locale, ['common'])),