diff --git a/ui/component/claimPreview/view.jsx b/ui/component/claimPreview/view.jsx
index d30f5a9c8..2a7ee681a 100644
--- a/ui/component/claimPreview/view.jsx
+++ b/ui/component/claimPreview/view.jsx
@@ -102,8 +102,7 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
 
   const isChannel = isValid ? parseURI(uri).isChannel : false;
   const signingChannel = claim && claim.signing_channel;
-  const canonicalUrl = claim && claim.canonical_url;
-  const navigateUrl = canonicalUrl ? formatLbryUrlForWeb(canonicalUrl) : undefined;
+  const navigateUrl = formatLbryUrlForWeb((claim && claim.canonical_url) || uri || '/');
   const navLinkProps = {
     to: navigateUrl,
     onClick: e => e.stopPropagation(),
@@ -168,7 +167,7 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
     }
 
     if (claim && !pending) {
-      history.push(navigateUrl || uri);
+      history.push(navigateUrl);
     }
   }
 
diff --git a/ui/component/claimPreviewTile/view.jsx b/ui/component/claimPreviewTile/view.jsx
index 2009e6601..443b40ca8 100644
--- a/ui/component/claimPreviewTile/view.jsx
+++ b/ui/component/claimPreviewTile/view.jsx
@@ -59,7 +59,7 @@ function ClaimPreviewTile(props: Props) {
   const thumbnailUrl = useGetThumbnail(uri, claim, streamingUrl, getFile, placeholder) || thumbnail;
   const claimsInChannel = (claim && claim.meta.claims_in_channel) || 0;
   const canonicalUrl = claim && claim.canonical_url;
-  const navigateUrl = canonicalUrl ? formatLbryUrlForWeb(canonicalUrl) : undefined;
+  const navigateUrl = formatLbryUrlForWeb(canonicalUrl || uri || '/');
 
   const navLinkProps = {
     to: navigateUrl,