diff --git a/src/app/components/message/content/ImageContent.tsx b/src/app/components/message/content/ImageContent.tsx
index 5d3e5512..69c7ade8 100644
--- a/src/app/components/message/content/ImageContent.tsx
+++ b/src/app/components/message/content/ImageContent.tsx
@@ -178,7 +178,7 @@ export const ImageContent = as<'div', ImageContentProps>(
             })}
           </Box>
         )}
-        {blurred && (
+        {blurred && !error && srcState.status !== AsyncStatus.Error && (
           <Box className={css.AbsoluteContainer} alignItems="Center" justifyContent="Center">
             <TooltipProvider
               tooltip={
diff --git a/src/app/components/upload-card/UploadCardRenderer.tsx b/src/app/components/upload-card/UploadCardRenderer.tsx
index 7fc046b0..4cc8a00c 100644
--- a/src/app/components/upload-card/UploadCardRenderer.tsx
+++ b/src/app/components/upload-card/UploadCardRenderer.tsx
@@ -70,7 +70,7 @@ export function UploadCardRenderer({
             <TooltipProvider
               tooltip={
                 <Tooltip variant="SurfaceVariant">
-                  <Text>Spoiler Image</Text>
+                  <Text>Mark as Spoiler</Text>
                 </Tooltip>
               }
               position="Top"
@@ -80,7 +80,7 @@ export function UploadCardRenderer({
                 <IconButton
                   ref={triggerRef}
                   onClick={toggleSpoiler}
-                  aria-label="Spoil Image"
+                  aria-label="Mark as Spoiler"
                   variant="SurfaceVariant"
                   radii="Pill"
                   size="300"