diff --git a/ui/src/common/ContextMenus.js b/ui/src/common/ContextMenus.js
index cddae1f08..650f52ffe 100644
--- a/ui/src/common/ContextMenus.js
+++ b/ui/src/common/ContextMenus.js
@@ -166,17 +166,18 @@ const ContextMenu = ({
   )
 }
 
-export const AlbumContextMenu = (props) => (
-  <ContextMenu
-    {...props}
-    resource={'album'}
-    songQueryParams={{
-      pagination: { page: 1, perPage: -1 },
-      sort: { field: 'discNumber, trackNumber', order: 'ASC' },
-      filter: { album_id: props.record.id, disc_number: props.discNumber },
-    }}
-  />
-)
+export const AlbumContextMenu = (props) =>
+  props.record ? (
+    <ContextMenu
+      {...props}
+      resource={'album'}
+      songQueryParams={{
+        pagination: { page: 1, perPage: -1 },
+        sort: { field: 'discNumber, trackNumber', order: 'ASC' },
+        filter: { album_id: props.record.id, disc_number: props.discNumber },
+      }}
+    />
+  ) : null
 
 AlbumContextMenu.propTypes = {
   record: PropTypes.object,
@@ -190,17 +191,18 @@ AlbumContextMenu.defaultProps = {
   addLabel: true,
 }
 
-export const ArtistContextMenu = (props) => (
-  <ContextMenu
-    {...props}
-    resource={'artist'}
-    songQueryParams={{
-      pagination: { page: 1, perPage: 200 },
-      sort: { field: 'album, discNumber, trackNumber', order: 'ASC' },
-      filter: { album_artist_id: props.record.id },
-    }}
-  />
-)
+export const ArtistContextMenu = (props) =>
+  props.record ? (
+    <ContextMenu
+      {...props}
+      resource={'artist'}
+      songQueryParams={{
+        pagination: { page: 1, perPage: 200 },
+        sort: { field: 'album, discNumber, trackNumber', order: 'ASC' },
+        filter: { album_artist_id: props.record.id },
+      }}
+    />
+  ) : null
 
 ArtistContextMenu.propTypes = {
   record: PropTypes.object,