diff --git a/src/renderer/features/albums/components/album-detail-content.tsx b/src/renderer/features/albums/components/album-detail-content.tsx
index 7f3bd6178..40454df75 100644
--- a/src/renderer/features/albums/components/album-detail-content.tsx
+++ b/src/renderer/features/albums/components/album-detail-content.tsx
@@ -372,9 +372,7 @@ export const AlbumDetailContent = () => {
             <div className={styles.detailContainer}>
                 {comment && (
                     <Spoiler maxHeight={75}>
-                        <Text
-                            dangerouslySetInnerHTML={{ __html: replaceURLWithHTMLLinks(comment) }}
-                        />
+                        <Text pb="md">{replaceURLWithHTMLLinks(comment)}</Text>
                     </Spoiler>
                 )}
                 <div className={styles.contentLayout}>
diff --git a/src/renderer/features/albums/routes/dummy-album-detail-route.tsx b/src/renderer/features/albums/routes/dummy-album-detail-route.tsx
index e7ccba4a0..8603a80c8 100644
--- a/src/renderer/features/albums/routes/dummy-album-detail-route.tsx
+++ b/src/renderer/features/albums/routes/dummy-album-detail-route.tsx
@@ -212,11 +212,7 @@ const DummyAlbumDetailRoute = () => {
                     {comment && (
                         <section>
                             <Spoiler maxHeight={75}>
-                                <Text
-                                    dangerouslySetInnerHTML={{
-                                        __html: replaceURLWithHTMLLinks(comment),
-                                    }}
-                                />
+                                <Text pb="md">{replaceURLWithHTMLLinks(comment)}</Text>
                             </Spoiler>
                         </section>
                     )}
diff --git a/src/renderer/features/item-details/components/item-details-modal.tsx b/src/renderer/features/item-details/components/item-details-modal.tsx
index 6001a55a7..6e2fcba97 100644
--- a/src/renderer/features/item-details/components/item-details-modal.tsx
+++ b/src/renderer/features/item-details/components/item-details-modal.tsx
@@ -98,7 +98,11 @@ const formatArtists = (artists: null | RelatedArtist[] | undefined) =>
     ));
 
 const formatComment = (item: Album | Song) =>
-    item.comment ? <Spoiler maxHeight={50}>{replaceURLWithHTMLLinks(item.comment)}</Spoiler> : null;
+    item.comment ? (
+        <Spoiler maxHeight={50}>
+            <Text>{replaceURLWithHTMLLinks(item.comment)}</Text>
+        </Spoiler>
+    ) : null;
 
 const FormatGenre = (item: Album | AlbumArtist | Playlist | Song) => {
     if (!item.genres?.length) {