diff --git a/components/badge/Danger.vue b/components/badge/Danger.vue
index fbdfc8c48791921b72eb4673243489cd98554937..d5a89ef3f15467629c1ff31433111ef16f588094 100644
--- a/components/badge/Danger.vue
+++ b/components/badge/Danger.vue
@@ -3,10 +3,8 @@
 		:class="classWarning"
 		:title="title"
 		v-if="
-			!(
-				memberStatus == 'MEMBER' &&
-				$options.filters.dateStatus(limitDate) == 'success'
-			) && memberStatus != 'NEWCOMER'
+			$options.filters.dateStatus(limitDate) != 'success' &&
+			!['NEWCOMER', 'REVOKED'].includes(memberStatus)
 		"
 		><outline-exclamation-icon class="icon" />
 		<span class="sr-only" v-if="title">{{ title }}</span>
@@ -29,8 +27,7 @@ export default {
 		classWarning() {
 			return {
 				"text-danger":
-					this.$options.filters.dateStatus(this.limitDate) == "danger" ||
-					this.memberStatus == "MISSING",
+					this.$options.filters.dateStatus(this.limitDate) == "danger",
 				"text-warning":
 					this.$options.filters.dateStatus(this.limitDate) == "warning"
 			}
diff --git a/components/member/List.vue b/components/member/List.vue
index 429c0afe75f3caca6e5264a5961d008e5c04bf3f..ab1bec3952e45fa853e220a45d874573dcaa64c6 100644
--- a/components/member/List.vue
+++ b/components/member/List.vue
@@ -108,7 +108,7 @@
 									<div class="text-truncate">{{ member.uid }}</div>
 									&nbsp;
 									<BadgeDanger
-										:limitDate="Math.min(member.certsLimit, member.limitDate)"
+										:limitDate="member.certsLimit"
 										:memberStatus="member.status" />
 								</div>
 								<div class="text-muted small">