diff --git a/src/components/atoms/Table.tsx b/src/components/atoms/Table.tsx
index 2aa98832a..8665d4709 100644
--- a/src/components/atoms/Table.tsx
+++ b/src/components/atoms/Table.tsx
@@ -3,6 +3,7 @@ import DataTable, { IDataTableProps } from 'react-data-table-component'
 import Loader from './Loader'
 import Pagination from '../molecules/Pagination'
 import styles from './Table.module.css'
+import { useUserPreferences } from '../../providers/UserPreferences'
 
 interface TableProps extends IDataTableProps {
   isLoading?: boolean
@@ -13,7 +14,14 @@ interface TableProps extends IDataTableProps {
 }
 
 function Empty({ message }: { message?: string }): ReactElement {
-  return <div className={styles.empty}>{message || 'No results found'}</div>
+  const { chainIds } = useUserPreferences()
+  return (
+    <div className={styles.empty}>
+      {chainIds.length === 0
+        ? 'No network selected'
+        : message || 'No results found'}
+    </div>
+  )
 }
 
 export default function Table({
diff --git a/src/components/organisms/AssetList.tsx b/src/components/organisms/AssetList.tsx
index 3368163bf..024f47c78 100644
--- a/src/components/organisms/AssetList.tsx
+++ b/src/components/organisms/AssetList.tsx
@@ -68,7 +68,11 @@ const AssetList: React.FC<AssetListProps> = ({
     [className]: className
   })
 
-  return assetsWithPrices &&
+  return chainIds.length === 0 ? (
+    <div className={styleClasses}>
+      <div className={styles.empty}>No network selected</div>
+    </div>
+  ) : assetsWithPrices &&
     !loading &&
     (isLoading === undefined || isLoading === false) ? (
     <>
@@ -82,10 +86,8 @@ const AssetList: React.FC<AssetListProps> = ({
               noPublisher={noPublisher}
             />
           ))
-        ) : chainIds.length === 0 ? (
-          <div className={styles.empty}>No network selected.</div>
         ) : (
-          <div className={styles.empty}>No results found.</div>
+          <div className={styles.empty}>No results found</div>
         )}
       </div>
 
diff --git a/src/components/pages/Profile/History/PoolShares.tsx b/src/components/pages/Profile/History/PoolShares.tsx
index 78e836ea8..a9d0e5602 100644
--- a/src/components/pages/Profile/History/PoolShares.tsx
+++ b/src/components/pages/Profile/History/PoolShares.tsx
@@ -165,6 +165,7 @@ export default function PoolShares({
   const [loading, setLoading] = useState<boolean>(false)
   const [dataFetchInterval, setDataFetchInterval] = useState<NodeJS.Timeout>()
   const newCancelToken = useCancelToken()
+
   const fetchPoolSharesAssets = useCallback(
     async (cancelToken: CancelToken) => {
       if (!poolShares || isPoolSharesLoading) return