diff --git a/apps/client/src/features/session/components/session-list.tsx b/apps/client/src/features/session/components/session-list.tsx
index 34e39198..18a30458 100644
--- a/apps/client/src/features/session/components/session-list.tsx
+++ b/apps/client/src/features/session/components/session-list.tsx
@@ -26,7 +26,7 @@ export default function SessionList() {
   const revokeAllSessionsMutation = useRevokeAllSessionsMutation();
   const [visibleCount, setVisibleCount] = useState(PAGE_SIZE);
 
-  const otherSessions = sessions?.filter((s) => !s.isCurrent) ?? [];
+  const otherSessions = sessions?.filter((s) => !s?.isCurrentDevice) ?? [];
   const visibleSessions = sessions?.slice(0, visibleCount) ?? [];
   const hasMore = sessions && visibleCount < sessions.length;
 
@@ -107,7 +107,7 @@ export default function SessionList() {
                     <Text size="sm">
                       {session.deviceName || t("Unknown device")}
                     </Text>
-                    {session.isCurrent && (
+                    {session?.isCurrentDevice && (
                       <Text size="xs" c="blue">
                         {t("This Device")}
                       </Text>
@@ -117,14 +117,14 @@ export default function SessionList() {
               </Table.Td>
               <Table.Td>
                 <Text size="sm">
-                  {session.isCurrent
+                  {session?.isCurrentDevice
                     ? t("Now")
                     : formattedDate(new Date(session.lastActiveAt))}
                 </Text>
               </Table.Td>
               {otherSessions.length > 0 && (
                 <Table.Td>
-                  {!session.isCurrent && (
+                  {!session?.isCurrentDevice && (
                     <Button
                       variant="outline"
                       size="xs"
diff --git a/apps/client/src/features/session/types/session.types.ts b/apps/client/src/features/session/types/session.types.ts
index ed0a3903..636f8c30 100644
--- a/apps/client/src/features/session/types/session.types.ts
+++ b/apps/client/src/features/session/types/session.types.ts
@@ -4,5 +4,5 @@ export type ISession = {
   geoLocation: string | null;
   lastActiveAt: string;
   createdAt: string;
-  isCurrent: boolean;
+  isCurrentDevice?: boolean;
 };
diff --git a/apps/server/src/core/session/session.service.ts b/apps/server/src/core/session/session.service.ts
index cd60ee3b..5b2ec47c 100644
--- a/apps/server/src/core/session/session.service.ts
+++ b/apps/server/src/core/session/session.service.ts
@@ -71,12 +71,12 @@ export class SessionService {
       geoLocation: s.geoLocation,
       lastActiveAt: s.lastActiveAt,
       createdAt: s.createdAt,
-      isCurrent: s.id === currentSessionId,
+      isCurrentDevice: s.id === currentSessionId,
     }));
 
     return mapped.sort((a, b) => {
-      if (a.isCurrent) return -1;
-      if (b.isCurrent) return 1;
+      if (a.isCurrentDevice) return -1;
+      if (b.isCurrentDevice) return 1;
       return 0;
     });
   }