diff --git a/packages/pl-fe/src/pages/settings/auth-token-list.tsx b/packages/pl-fe/src/pages/settings/auth-token-list.tsx
index a8edf6658..f3cf886cb 100644
--- a/packages/pl-fe/src/pages/settings/auth-token-list.tsx
+++ b/packages/pl-fe/src/pages/settings/auth-token-list.tsx
@@ -158,7 +158,7 @@ const AuthTokenListPage: React.FC = () => {
   const body = tokens ? (
     <div className='grid grid-cols-1 gap-4 sm:grid-cols-2'>
       {tokens.map((token) => (
-        <AuthToken key={token.id} token={token} isCurrent={String(token.id) === currentTokenId} />
+        <AuthToken key={token.id} token={token} isCurrent={token.is_current || String(token.id) === currentTokenId} />
       ))}
     </div>
   ) : <Spinner />;