diff --git a/packages/client/src/components/media-image.vue b/packages/client/src/components/media-image.vue
index 69b94514a..ac22557f9 100644
--- a/packages/client/src/components/media-image.vue
+++ b/packages/client/src/components/media-image.vue
@@ -13,7 +13,7 @@
 		:href="image.url"
 		:title="image.name"
 	>
-		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment || image.name" :title="image.comment || image.name" :cover="false"/>
+		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment" :title="image.comment" :cover="false"/>
 		<div v-if="image.type === 'image/gif'" class="gif">GIF</div>
 	</a>
 	<button v-tooltip="i18n.ts.hide" class="_button hide" @click="hide = true"><i class="fas fa-eye-slash"></i></button>
diff --git a/packages/client/src/components/media-list.vue b/packages/client/src/components/media-list.vue
index f9f017cfd..7e241d2da 100644
--- a/packages/client/src/components/media-list.vue
+++ b/packages/client/src/components/media-list.vue
@@ -43,8 +43,7 @@ onMounted(() => {
 					src: media.url,
 					w: media.properties.width,
 					h: media.properties.height,
-					alt: media.comment || media.name,
-					comment: media.comment,
+					alt: media.comment,
 				};
 				if (media.properties.orientation != null && media.properties.orientation >= 5) {
 					[item.w, item.h] = [item.h, item.w];
@@ -87,8 +86,7 @@ onMounted(() => {
 			[itemData.w, itemData.h] = [itemData.h, itemData.w];
 		}
 		itemData.msrc = file.thumbnailUrl;
-		itemData.alt = file.comment || file.name;
-		itemData.comment = file.comment;
+		itemData.alt = file.comment;
 		itemData.thumbCropped = true;
 	});
 
@@ -114,7 +112,7 @@ onMounted(() => {
 				el.onpointermove = preventProp;
 
 				pwsp.on('change', () => {
-					textBox.textContent = pwsp.currSlide.data.comment?.trim();
+					textBox.textContent = pwsp.currSlide.data.alt?.trim();
 				});
 			},
 		});