diff --git a/src/clients/OtterspaceSubgraph.ts b/src/clients/OtterspaceSubgraph.ts
index 1707201d5..6742a5cd5 100644
--- a/src/clients/OtterspaceSubgraph.ts
+++ b/src/clients/OtterspaceSubgraph.ts
@@ -90,7 +90,7 @@ export type OtterspaceBadgeSpec = {
   metadata: {
     name: string
     description: string
-    expiresAt?: number | null
+    expiresAt?: string | null
     image: string
   }
   raft?: {
diff --git a/src/components/User/Badges/Badge.css b/src/components/User/Badges/Badge.css
index cc1952cbe..9b1b57d86 100644
--- a/src/components/User/Badges/Badge.css
+++ b/src/components/User/Badges/Badge.css
@@ -46,6 +46,6 @@
   background-position: right bottom;
 }
 
-.Badge__Icon--revoked {
+.Badge__Icon--past {
   filter: grayscale(1);
 }
diff --git a/src/components/User/Badges/Badge.tsx b/src/components/User/Badges/Badge.tsx
index 6396ddd6e..f6b392502 100644
--- a/src/components/User/Badges/Badge.tsx
+++ b/src/components/User/Badges/Badge.tsx
@@ -40,15 +40,13 @@ function getVariantClass(variant: BadgeVariant) {
 }
 
 export default function Badge({ badge, className, iconClassName, variant = BadgeVariant.Primary }: Props) {
-  const isRevoked = badge.status === BadgeStatus.Revoked
-
   return (
     <div className={classNames('Badge', className)}>
       <div
         className={classNames(
           'Badge__Icon',
           getVariantClass(variant),
-          isRevoked && 'Badge__Icon--revoked',
+          badge.isPastBadge && 'Badge__Icon--past',
           iconClassName
         )}
         style={{ backgroundImage: `url(${badge.image})` }}
diff --git a/src/entities/Badges/types.ts b/src/entities/Badges/types.ts
index eced07e36..155655457 100644
--- a/src/entities/Badges/types.ts
+++ b/src/entities/Badges/types.ts
@@ -1,5 +1,8 @@
 import { ethers } from 'ethers'
 
+import { OtterspaceBadge } from '../../clients/OtterspaceSubgraph'
+import Time from '../../utils/date/Time'
+
 export enum BadgeStatus {
   Burned = 'BURNED',
   Minted = 'MINTED',
@@ -18,6 +21,7 @@ export type Badge = {
   description: string
   image: string
   status: BadgeStatus
+  isPastBadge: boolean
   createdAt: number
 }
 
@@ -55,6 +59,32 @@ export function toBadgeStatus(value: string | null | undefined): BadgeStatus {
   else throw new Error(`Invalid BadgeStatus ${value}`)
 }
 
+export function isPastBadge(badge: OtterspaceBadge) {
+  const status = toBadgeStatus(badge.status)
+  const expiresAt = badge.spec.metadata.expiresAt
+  return (
+    (status === BadgeStatus.Revoked && badge.statusReason === BadgeStatusReason.TenureEnded) ||
+    (!!expiresAt && expiresAt.length > 0 && Time.utc(badge.spec.metadata.expiresAt).isBefore(Time.utc()))
+  )
+}
+
+export function toGovernanceBadge(otterspaceBadge: OtterspaceBadge) {
+  const { name, description, image } = otterspaceBadge.spec.metadata
+  const badge: Badge = {
+    name,
+    description,
+    createdAt: otterspaceBadge.createdAt,
+    image: getIpfsHttpsLink(image),
+    status: toBadgeStatus(otterspaceBadge.status),
+    isPastBadge: isPastBadge(otterspaceBadge),
+  }
+  return badge
+}
+
+function getIpfsHttpsLink(ipfsLink: string) {
+  return ipfsLink.replace('ipfs://', 'https://ipfs.io/ipfs/')
+}
+
 export function isOtterspaceRevokeReason(value: string | null | undefined): boolean {
   switch (value) {
     case OtterspaceRevokeReason.Abuse:
diff --git a/src/services/BadgesService.ts b/src/services/BadgesService.ts
index 2f772be49..64825d879 100644
--- a/src/services/BadgesService.ts
+++ b/src/services/BadgesService.ts
@@ -19,12 +19,11 @@ import {
   Badge,
   BadgeCreationResult,
   BadgeStatus,
-  BadgeStatusReason,
   ErrorReason,
   OtterspaceRevokeReason,
   RevokeOrReinstateResult,
   UserBadges,
-  toBadgeStatus,
+  toGovernanceBadge,
 } from '../entities/Badges/types'
 import {
   getLandOwnerAddresses,
@@ -54,18 +53,10 @@ export class BadgesService {
     const expiredBadges: Badge[] = []
     for (const otterspaceBadge of otterspaceBadges) {
       try {
-        const status = toBadgeStatus(otterspaceBadge.status)
-        if (status !== BadgeStatus.Burned) {
+        const badge = toGovernanceBadge(otterspaceBadge)
+        if (badge.status !== BadgeStatus.Burned) {
           if (otterspaceBadge.spec.metadata) {
-            const { name, description, image } = otterspaceBadge.spec.metadata
-            const badge = {
-              name,
-              description,
-              status,
-              image: BadgesService.getIpfsHttpsLink(image),
-              createdAt: otterspaceBadge.createdAt,
-            }
-            if (this.badgeExpired(status, otterspaceBadge.statusReason)) {
+            if (badge.isPastBadge) {
               expiredBadges.push(badge)
             } else {
               currentBadges.push(badge)
@@ -84,14 +75,6 @@ export class BadgesService {
     return { currentBadges, expiredBadges, total: currentBadges.length + expiredBadges.length }
   }
 
-  private static badgeExpired(status: BadgeStatus, statusReason: string) {
-    return status === BadgeStatus.Revoked && statusReason === BadgeStatusReason.TenureEnded
-  }
-
-  private static getIpfsHttpsLink(ipfsLink: string) {
-    return ipfsLink.replace('ipfs://', 'https://ipfs.io/ipfs/')
-  }
-
   public static async giveBadgeToUsers(badgeCid: string, users: string[]): Promise<AirdropOutcome> {
     try {
       const { eligibleUsers, usersWithBadgesToReinstate, error } = await getValidatedUsersForBadge(badgeCid, users)