diff --git a/src/components/03_customer-management/ExpirationDate.vue b/src/components/03_customer-management/ExpirationDate.vue
index 5c5677c7..0b911957 100644
--- a/src/components/03_customer-management/ExpirationDate.vue
+++ b/src/components/03_customer-management/ExpirationDate.vue
@@ -15,7 +15,10 @@ function calculateDaysUntilExpire(expireDate: Date): number {
 
 <template>
   <template v-if="calculateDaysUntilExpire(expirationDate) <= 90">
-    <q-badge color="red" class="text-weight-bold">
+    <q-badge
+      :color="calculateDaysUntilExpire(expirationDate) > 0 ? 'orange' : 'red'"
+      class="text-weight-bold"
+    >
       {{
         calculateDaysUntilExpire(expirationDate) > 0
           ? 'จะครบกำหนดในอีก'