diff --git a/apps/dashboard/src/components/overview/overview-widget-table.tsx b/apps/dashboard/src/components/overview/overview-widget-table.tsx
index 55849115..4c6aafbe 100644
--- a/apps/dashboard/src/components/overview/overview-widget-table.tsx
+++ b/apps/dashboard/src/components/overview/overview-widget-table.tsx
@@ -144,13 +144,19 @@ export function OverviewWidgetTablePages({
                       setFilter('origin', item.origin);
                     }}
                   >
-                    {showDomain ? (
+                    {item.path ? (
                       <>
-                        <span className="opacity-40">{item.origin}</span>
-                        <span>{item.path}</span>
+                        {showDomain ? (
+                          <>
+                            <span className="opacity-40">{item.origin}</span>
+                            <span>{item.path}</span>
+                          </>
+                        ) : (
+                          item.path
+                        )}
                       </>
                     ) : (
-                      item.path
+                      <span className="opacity-40">Not set</span>
                     )}
                   </button>
                   <a
diff --git a/packages/db/src/buffers/session-buffer.ts b/packages/db/src/buffers/session-buffer.ts
index 8cf68477..df791d6b 100644
--- a/packages/db/src/buffers/session-buffer.ts
+++ b/packages/db/src/buffers/session-buffer.ts
@@ -46,12 +46,18 @@ export class SessionBuffer extends BaseBuffer {
 
       newSession.ended_at = event.created_at;
       newSession.version = existingSession.version + 1;
-      if (!newSession.entry_path) {
+      if (!newSession.entry_path && event.path) {
         newSession.entry_path = event.path;
+      }
+      if (!newSession.entry_origin && event.origin) {
         newSession.entry_origin = event.origin;
       }
-      newSession.exit_path = event.path;
-      newSession.exit_origin = event.origin;
+      if (event.path) {
+        newSession.exit_path = event.path;
+      }
+      if (event.origin) {
+        newSession.exit_origin = event.origin;
+      }
       newSession.duration =
         new Date(newSession.ended_at).getTime() -
         new Date(newSession.created_at).getTime();