diff --git a/ui/src/common/SongContextMenu.js b/ui/src/common/SongContextMenu.js
index c39b394b2..92a44e99c 100644
--- a/ui/src/common/SongContextMenu.js
+++ b/ui/src/common/SongContextMenu.js
@@ -143,6 +143,7 @@ SongContextMenu.propTypes = {
 SongContextMenu.defaultProps = {
   visible: true,
   showStar: true,
+  addLabel: true,
 }
 
 export default SongContextMenu
diff --git a/ui/src/common/SongDatagrid.js b/ui/src/common/SongDatagrid.js
index ce3968f13..063141847 100644
--- a/ui/src/common/SongDatagrid.js
+++ b/ui/src/common/SongDatagrid.js
@@ -58,6 +58,7 @@ export const SongDatagridRow = ({
               ? child
               : cloneElement(child, {
                   visible: contextVisible || visible,
+                  ...child.props,
                   ...rest,
                 }))
         )}
@@ -85,7 +86,7 @@ export const SongDatagrid = ({ multiDisc, contextVisible, ...rest }) => {
       }
     />
   )
-  return <Datagrid {...rest} body={<SongDatagridBody />} optimized />
+  return <Datagrid {...rest} body={<SongDatagridBody />} />
 }
 
 SongDatagrid.propTypes = {
diff --git a/ui/src/song/SongList.js b/ui/src/song/SongList.js
index 247a5a282..beaa41e7d 100644
--- a/ui/src/song/SongList.js
+++ b/ui/src/song/SongList.js
@@ -72,6 +72,7 @@ const SongList = (props) => {
           <DurationField source="duration" />
           {isDesktop ? (
             <SongContextMenu
+              source={'starred'}
               label={translate('resources.song.fields.starred')}
               sortBy={'starred DESC, starredAt ASC'}
             />