diff --git a/src/components/OrderList.vue b/src/components/OrderList.vue
index c0a780a..1fb7070 100644
--- a/src/components/OrderList.vue
+++ b/src/components/OrderList.vue
@@ -84,8 +84,8 @@
             <template #default="scope">
               <div v-if="scope.row.delivery_date && scope.row.time_period_name"
                    :class="{
-                     'time-in-progress': getDeliveryTimeStatus(scope.row.delivery_date, scope.row.time_period_name) === 'in-progress',
-                     'time-expired': getDeliveryTimeStatus(scope.row.delivery_date, scope.row.time_period_name) === 'expired'
+                     'time-in-progress': ['CREATED', 'RECEIVED', 'DELIVERING'].includes(scope.row.status) && getDeliveryTimeStatus(scope.row.delivery_date, scope.row.time_period_name) === 'in-progress',
+                     'time-expired': ['CREATED', 'RECEIVED', 'DELIVERING'].includes(scope.row.status) && getDeliveryTimeStatus(scope.row.delivery_date, scope.row.time_period_name) === 'expired'
                    }">
                 <div>{{ scope.row.delivery_date }}</div>
                 <div>{{ scope.row.time_period_name }}</div>