diff --git a/lib/use-collection-view.js b/lib/use-collection-view.js
index 6df3979..36880f8 100644
--- a/lib/use-collection-view.js
+++ b/lib/use-collection-view.js
@@ -6,7 +6,7 @@ import { downloadCollectionCardsCsv } from './collection-cards-csv.js';
 /**
  * Card/collection page state and handlers (god-component split).
  */
-export function useCollectionView() {
+export function useCollectionView({ user = null, authLoading = true } = {}) {
   const router = useRouter();
   const { identifier } = router.query;
   
@@ -435,7 +435,7 @@ export function useCollectionView() {
     }
   });
 
-  const showInitialLoading = loading;
+  const showInitialLoading = authLoading || loading;
 
   return {
     cards,
@@ -456,7 +456,6 @@ export function useCollectionView() {
     handleSearchCards,
     handleToggleFavorite,
     handleToggleSelect,
-    id,
     identifier,
     isFavorited,
     loading,
diff --git a/pages/collection/[identifier].js b/pages/collection/[identifier].js
index 82fb542..f40f7cf 100644
--- a/pages/collection/[identifier].js
+++ b/pages/collection/[identifier].js
@@ -6,7 +6,7 @@ import { useCollectionView } from '../../lib/use-collection-view.js';
 
 export default function CollectionView() {
   const { user, loading: authLoading } = useAuth();
-  const collectionPage = useCollectionView();
+  const collectionPage = useCollectionView({ user, authLoading });
 
   if (collectionPage.showInitialLoading) {
     return (