diff --git a/superset-frontend/src/components/ListViewCard/index.tsx b/superset-frontend/src/components/ListViewCard/index.tsx
index fad515110c..a68974597f 100644
--- a/superset-frontend/src/components/ListViewCard/index.tsx
+++ b/superset-frontend/src/components/ListViewCard/index.tsx
@@ -137,7 +137,7 @@ interface LinkProps {
 }
 
 const AnchorLink: React.FC<LinkProps> = ({ to, children }) => (
-  <a href={to}>{children}</a>
+  <a {...(to ? { href: to } : {})}>{children}</a>
 );
 
 interface CardProps {
diff --git a/superset-frontend/src/views/CRUD/chart/ChartCard.tsx b/superset-frontend/src/views/CRUD/chart/ChartCard.tsx
index 4a04638794..139b922a3d 100644
--- a/superset-frontend/src/views/CRUD/chart/ChartCard.tsx
+++ b/superset-frontend/src/views/CRUD/chart/ChartCard.tsx
@@ -134,7 +134,7 @@ export default function ChartCard({
   return (
     <CardStyles
       onClick={() => {
-        if (!bulkSelectEnabled) {
+        if (!bulkSelectEnabled && chart.url) {
           window.location.href = chart.url;
         }
       }}