diff --git a/next-env.d.ts b/next-env.d.ts
index 3cd7048e..725dd6f2 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/src/components/common/FilterLink.tsx b/src/components/common/FilterLink.tsx
index ef278ed2..26ececda 100644
--- a/src/components/common/FilterLink.tsx
+++ b/src/components/common/FilterLink.tsx
@@ -42,7 +42,7 @@ export function FilterLink({
           {safeDecodeURIComponent(label || value)}
         </Link>
       )}
-      {externalUrl && (
+      {value && (
         <a className={styles.link} href={externalUrl} target="_blank" rel="noreferrer noopener">
           <Icon className={styles.icon}>
             <Icons.External />
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 688dd11d..e58d77ad 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -113,6 +113,7 @@ export const labels = defineMessages({
   filterRaw: { id: 'label.filter-raw', defaultMessage: 'Raw' },
   views: { id: 'label.views', defaultMessage: 'Views' },
   none: { id: 'label.none', defaultMessage: 'None' },
+  directNone: { id: 'label.direct-none', defaultMessage: 'Direct / None' },
   clearAll: { id: 'label.clear-all', defaultMessage: 'Clear all' },
   property: { id: 'label.property', defaultMessage: 'Property' },
   today: { id: 'label.today', defaultMessage: 'Today' },
diff --git a/src/components/metrics/ReferrersTable.tsx b/src/components/metrics/ReferrersTable.tsx
index d83c4d12..5785915f 100644
--- a/src/components/metrics/ReferrersTable.tsx
+++ b/src/components/metrics/ReferrersTable.tsx
@@ -12,7 +12,7 @@ export function ReferrersTable(props: MetricsTableProps) {
         id="referrer"
         value={referrer}
         externalUrl={`https://${referrer}`}
-        label={!referrer && formatMessage(labels.none)}
+        label={!referrer && formatMessage(labels.directNone)}
       >
         <Favicon domain={referrer} />
       </FilterLink>
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index f734b1dd..f089d6e3 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -34,8 +34,7 @@ async function relationalQuery(
   let entryExitQuery = '';
   let excludeDomain = '';
   if (column === 'referrer_domain') {
-    excludeDomain = `and website_event.referrer_domain != {{websiteDomain}}
-      and website_event.referrer_domain is not null`;
+    excludeDomain = `and website_event.referrer_domain != {{websiteDomain}}`;
   }
 
   if (type === 'entry' || type === 'exit') {
@@ -97,7 +96,7 @@ async function clickhouseQuery(
     let entryExitQuery = '';
 
     if (column === 'referrer_domain') {
-      excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`;
+      excludeDomain = `and referrer_domain != {websiteDomain:String}`;
     }
 
     if (type === 'entry' || type === 'exit') {