diff --git a/src/UI/Image/ImageOperations.svelte b/src/UI/Image/ImageOperations.svelte
index 46b8d2dd3..e1123bfa4 100644
--- a/src/UI/Image/ImageOperations.svelte
+++ b/src/UI/Image/ImageOperations.svelte
@@ -60,7 +60,7 @@
     class="pointer-events-none absolute bottom-0 left-0 flex w-full flex-wrap items-end justify-between"
   >
     <div class="pointer-events-auto m-1 w-fit transition-colors duration-200">
-      <ImageAttribution image={$image} attributionFormat="large" />
+      <ImageAttribution {image} attributionFormat="large" />
     </div>
 
     <slot />
diff --git a/src/UI/Image/NearbyImages.svelte b/src/UI/Image/NearbyImages.svelte
index 9b66d109d..98e811210 100644
--- a/src/UI/Image/NearbyImages.svelte
+++ b/src/UI/Image/NearbyImages.svelte
@@ -157,7 +157,7 @@
           type: "Feature",
           geometry: { type: "Point", coordinates: GeoOperations.centerpointCoordinates(feature) },
           properties: <HotspotProperties>{
-            name: layer.title?.GetRenderValue(feature.properties).Subs(feature.properties).txt,
+            name: layer.title?.GetRenderValue(feature.properties)?.Subs(feature.properties)?.txt ?? "Feature",
             focus: true,
           },
         },