diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index d0ef663..d27af73 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -221,16 +221,14 @@
 
 <main>
     {#each sortedStudySpaces as studySpace (studySpace.id)}
-        {@const imgUrl =
-            studySpace.study_space_images.length > 0
+        <SpaceCard
+            alt="Photo of {studySpace.description}"
+            href="/space/{studySpace.id}"
+            imgSrc={studySpace.study_space_images.length > 0
                 ? supabase.storage
                       .from("files_bucket")
                       .getPublicUrl(studySpace.study_space_images[0].image_path).data.publicUrl
                 : defaultImg}
-        <SpaceCard
-            alt="Photo of {studySpace.description}"
-            href="/space/{studySpace.id}"
-            imgSrc={imgUrl}
             space={studySpace}
             isFavourite={favouriteIds.includes(studySpace.id)}
             onToggleFavourite={session ? () => handleToggleFavourite(studySpace.id) : undefined}