diff --git a/apps/start/src/modals/event-details.tsx b/apps/start/src/modals/event-details.tsx
index e0484048..78f64d1f 100644
--- a/apps/start/src/modals/event-details.tsx
+++ b/apps/start/src/modals/event-details.tsx
@@ -18,14 +18,8 @@ import { useTRPC } from '@/integrations/trpc/react';
 import { cn } from '@/utils/cn';
 import { getProfileName } from '@/utils/getters';
 import type { IClickhouseEvent, IServiceEvent } from '@openpanel/db';
-import { useQuery, useSuspenseQuery } from '@tanstack/react-query';
-import {
-  ArrowLeftIcon,
-  ArrowRightIcon,
-  FilterIcon,
-  Loader2Icon,
-  XIcon,
-} from 'lucide-react';
+import { useQuery } from '@tanstack/react-query';
+import { FilterIcon, XIcon } from 'lucide-react';
 import { omit } from 'ramda';
 import { useState } from 'react';
 import { popModal } from '.';
diff --git a/packages/trpc/src/routers/event.ts b/packages/trpc/src/routers/event.ts
index d710df97..d9f299be 100644
--- a/packages/trpc/src/routers/event.ts
+++ b/packages/trpc/src/routers/event.ts
@@ -4,6 +4,7 @@ import { z } from 'zod';
 
 import {
   type IServiceProfile,
+  type IServiceSession,
   TABLE_NAMES,
   chQuery,
   convertClickhouseDateToJs,
@@ -104,7 +105,10 @@ export const eventRouter = createTRPCRouter({
         });
       }
 
-      const session = await sessionService.byId(res?.sessionId, projectId);
+      let session: IServiceSession | undefined;
+      if (res?.sessionId) {
+        session = await sessionService.byId(res?.sessionId, projectId);
+      }
 
       return {
         event: res,