diff --git a/src/app/coffee-abonnements/hooks/useCoffeePictures.ts b/src/app/coffee-abonnements/hooks/useCoffeePictures.ts
index f326651..a170e63 100644
--- a/src/app/coffee-abonnements/hooks/useCoffeePictures.ts
+++ b/src/app/coffee-abonnements/hooks/useCoffeePictures.ts
@@ -40,7 +40,6 @@ export function useCoffeePictures(coffeeId?: string) {
 
   useEffect(() => {
     if (!coffeeId) {
-      setPictureUrls([]);
       return;
     }
 
@@ -51,9 +50,10 @@ export function useCoffeePictures(coffeeId?: string) {
     ];
 
     let isCancelled = false;
-    setLoading(true);
 
     const loadPictures = async () => {
+      if (!isCancelled) setLoading(true);
+
       for (const url of candidateUrls) {
         try {
           const response = await authFetch(url, {
@@ -105,5 +105,8 @@ export function useCoffeePictures(coffeeId?: string) {
     };
   }, [coffeeId]);
 
-  return { pictureUrls, loading };
+  return {
+    pictureUrls: coffeeId ? pictureUrls : [],
+    loading: coffeeId ? loading : false,
+  };
 }