diff --git a/packages/web/src/components/test-tracks-table/TestTracksTable.tsx b/packages/web/src/components/test-tracks-table/TestTracksTable.tsx
index ecc1fb8387..bc445989d3 100644
--- a/packages/web/src/components/test-tracks-table/TestTracksTable.tsx
+++ b/packages/web/src/components/test-tracks-table/TestTracksTable.tsx
@@ -271,12 +271,12 @@ export const TestTracksTable = ({
     (cellInfo) => {
       const track = cellInfo.row.original
       const deleted = track.is_delete || track.user?.is_deactivated
-      if (deleted) {
+      const isOwner = track.owner_id === userId
+      if (deleted || isOwner) {
         return <div className={styles.placeholderButton} />
       }
 
-      const isOwner = track.owner_id === userId
-      return isOwner ? null : (
+      return (
         <Tooltip
           text={track.has_current_user_reposted ? 'Unrepost' : 'Repost'}
           mount='page'
diff --git a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx
index a6d1b2c7cc..acb71b6b0b 100644
--- a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx
+++ b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx
@@ -286,7 +286,7 @@ const CollectionPage = ({
                 columns={tracksTableColumns}
                 wrapperClassName={styles.tracksTableWrapper}
                 key={playlistName}
-                loading={isNftPlaylist ? tracksLoading : collectionLoading}
+                loading={isNftPlaylist ? collectionLoading : tracksLoading}
                 userId={userId}
                 playing={playing}
                 playingIndex={playingIndex}
diff --git a/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx b/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx
index 6a60a3df47..8043b5354d 100644
--- a/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx
+++ b/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx
@@ -132,8 +132,11 @@ const SavedPage = ({
       : [[], -1]
   const { isLoading: isLoadingAlbums, setDidLoad: setDidLoadAlbums } =
     useOrderedLoad(account ? account.albums.length : 0)
-  const isEmpty = entries.length === 0
-  const tracksLoading = status === Status.LOADING && isEmpty
+  const isEmpty =
+    entries.length === 0 ||
+    !entries.some((entry: SavedPageTrack) => Boolean(entry.track_id))
+  const tracksLoading =
+    (status === Status.IDLE || status === Status.LOADING) && isEmpty
   const queuedAndPlaying = playing && isQueued
 
   // Setup play button