diff --git a/ui/src/common/ContextMenus.js b/ui/src/common/ContextMenus.js
index 60d1690c7..731d86b8f 100644
--- a/ui/src/common/ContextMenus.js
+++ b/ui/src/common/ContextMenus.js
@@ -110,14 +110,12 @@ const ContextMenu = ({
 
   return (
     <span className={classes.noWrap}>
-      {showStar && (
-        <StarButton
-          record={record}
-          resource={resource}
-          visible={visible}
-          color={color}
-        />
-      )}
+      <StarButton
+        record={record}
+        resource={resource}
+        visible={visible && showStar}
+        color={color}
+      />
       <IconButton
         aria-label="more"
         aria-controls="context-menu"
diff --git a/ui/src/common/SongDatagrid.js b/ui/src/common/SongDatagrid.js
index 7b9614683..fce83c799 100644
--- a/ui/src/common/SongDatagrid.js
+++ b/ui/src/common/SongDatagrid.js
@@ -54,6 +54,7 @@ const DiscSubtitleRow = ({
         <AlbumContextMenu
           record={{ id: record.albumId }}
           discNumber={record.discNumber}
+          showStar={false}
           visible={contextAlwaysVisible || visible}
         />
       </TableCell>