diff --git a/web/src/app.css b/web/src/app.css
index 082e03dfcf..5ea02ea1d9 100644
--- a/web/src/app.css
+++ b/web/src/app.css
@@ -44,6 +44,10 @@ body {
 	color: #5f6368;
 }
 
+input:focus-visible {
+	outline-offset: 0px !important;
+	outline: none !important;
+}
 @layer utilities {
 	.immich-form-input {
 		@apply bg-slate-100 p-2 rounded-md focus:border-immich-primary text-sm;
diff --git a/web/src/lib/components/shared-components/immich-thumbnail.svelte b/web/src/lib/components/shared-components/immich-thumbnail.svelte
index 92bcb27ddd..17769e4e65 100644
--- a/web/src/lib/components/shared-components/immich-thumbnail.svelte
+++ b/web/src/lib/components/shared-components/immich-thumbnail.svelte
@@ -246,25 +246,15 @@
 
 		<!-- Thumbnail -->
 		{#if intersecting}
-			{#await loadImageData()}
-				<div
-					style:width={`${thumbnailSize}px`}
-					style:height={`${thumbnailSize}px`}
-					class={`bg-immich-primary/10 ${getSize()} flex place-items-center place-content-center `}
-				>
-					...
-				</div>
-			{:then imageData}
-				<img
-					style:width={`${thumbnailSize}px`}
-					style:height={`${thumbnailSize}px`}
-					in:fade={{ duration: 250 }}
-					src={imageData}
-					alt={asset.id}
-					class={`object-cover ${getSize()} transition-all duration-100 z-0 ${getThumbnailBorderStyle()}`}
-					loading="lazy"
-				/>
-			{/await}
+			<img
+				style:width={`${thumbnailSize}px`}
+				style:height={`${thumbnailSize}px`}
+				in:fade={{ duration: 250 }}
+				src={`/api/asset/thumbnail/${asset.id}?format=${format}`}
+				alt={asset.id}
+				class={`object-cover ${getSize()} transition-all duration-100 z-0 ${getThumbnailBorderStyle()}`}
+				loading="lazy"
+			/>
 		{/if}
 
 		{#if mouseOver && asset.type === AssetTypeEnum.Video}