diff --git a/ui/src/album/AlbumListView.js b/ui/src/album/AlbumListView.js
index e5cdd99bd..6abf17ad9 100644
--- a/ui/src/album/AlbumListView.js
+++ b/ui/src/album/AlbumListView.js
@@ -40,7 +40,9 @@ const AlbumDetails = (props) => {
         <BooleanField source="compilation" />
         <DateField source="updatedAt" showTime />
         <SizeField source="size" />
-        <MultiLineTextField source="comment" />
+        {props.record && props.record['comment'] && (
+          <MultiLineTextField source="comment" />
+        )}
       </SimpleShowLayout>
     </Show>
   )
diff --git a/ui/src/common/SongDetails.js b/ui/src/common/SongDetails.js
index fd0b624f4..714c7e0b7 100644
--- a/ui/src/common/SongDetails.js
+++ b/ui/src/common/SongDetails.js
@@ -29,6 +29,9 @@ export const SongDetails = (props) => {
   if (!record.discSubtitle) {
     delete data.discSubtitle
   }
+  if (!record.comment) {
+    delete data.comment
+  }
   if (record.playCount > 0) {
     data.playDate = <DateField record={record} source="playDate" showTime />
   }