diff --git a/src/components/molecules/AssetTitle.tsx b/src/components/molecules/AssetTitle.tsx
index 92c9c3c20..faedf45d3 100644
--- a/src/components/molecules/AssetTitle.tsx
+++ b/src/components/molecules/AssetTitle.tsx
@@ -3,11 +3,18 @@ import { Link } from 'gatsby'
 import React, { ReactElement } from 'react'
 import styles from './AssetTitle.module.css'
 
-export default function AssetTitle({ did }: { did: string }): ReactElement {
-  const { title } = useMetadata(did)
+export default function AssetTitle({
+  did,
+  title
+}: {
+  did?: string
+  title?: string
+}): ReactElement {
+  const metadata = useMetadata(did)
+
   return (
     <h3 className={styles.title}>
-      <Link to={`/asset/${did}`}>{title || did}</Link>
+      <Link to={`/asset/${did}`}>{title || metadata.title || did}</Link>
     </h3>
   )
 }
diff --git a/src/components/molecules/Bookmarks.tsx b/src/components/molecules/Bookmarks.tsx
index 4a51a8b8e..f8ba7c83e 100644
--- a/src/components/molecules/Bookmarks.tsx
+++ b/src/components/molecules/Bookmarks.tsx
@@ -27,7 +27,8 @@ const columns = [
   {
     name: 'Data Set',
     selector: function getAssetRow(row: DDO) {
-      return <AssetTitle did={row.id} />
+      const { attributes } = row.findServiceByType('metadata')
+      return <AssetTitle title={attributes.main.name} />
     },
     grow: 2
   },