diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js
index 360cfe740..3f748c479 100644
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@@ -14,8 +14,10 @@ const BlockCard = {
     blocked () {
       return this.relationship.blocking
     },
+    blockExpiryAvailable () {
+      return this.user.block_expires_at !== undefined
+    },
     blockExpiry () {
-      console.log(this.user)
       return this.user.block_expires_at == null
         ? this.$t('user_card.block_expires_forever')
         : this.$t('user_card.block_expires_at', [new Date(this.user.mute_expires_at).toLocaleString()])
diff --git a/src/components/block_card/block_card.vue b/src/components/block_card/block_card.vue
index 61aafb288..9f64a8e8c 100644
--- a/src/components/block_card/block_card.vue
+++ b/src/components/block_card/block_card.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-user-card :user="user">
     <div class="block-card-content-container">
-      <span v-if="blocked" class="alert neutral">
+      <span v-if="blocked && blockExpiryAvailable" class="alert neutral">
         {{ blockExpiry }}
       </span>
       {{ ' ' }}
diff --git a/src/components/mute_card/mute_card.js b/src/components/mute_card/mute_card.js
index 3d655465f..2b4314294 100644
--- a/src/components/mute_card/mute_card.js
+++ b/src/components/mute_card/mute_card.js
@@ -13,6 +13,9 @@ const MuteCard = {
     muted () {
       return this.relationship.muting
     },
+    muteExpiryAvailable () {
+      return this.user.mute_expires_at !== undefined
+    },
     muteExpiry () {
       return this.user.mute_expires_at == null
         ? this.$t('user_card.mute_expires_forever')
diff --git a/src/components/mute_card/mute_card.vue b/src/components/mute_card/mute_card.vue
index 08f62da9a..60638d3ba 100644
--- a/src/components/mute_card/mute_card.vue
+++ b/src/components/mute_card/mute_card.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-user-card :user="user">
     <div class="mute-card-content-container">
-      <span v-if="muted" class="alert neutral">
+      <span v-if="muted && muteExpiryAvailable" class="alert neutral">
         {{ muteExpiry }}
       </span>
       {{ ' ' }}
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 0c01d5ff4..353a891f6 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -159,11 +159,17 @@ export default {
     supportsNote () {
       return 'note' in this.relationship
     },
+    muteExpiryAvailable () {
+      return this.user.mute_expires_at !== undefined
+    },
     muteExpiry () {
       return this.user.mute_expires_at == null
         ? this.$t('user_card.mute_expires_forever')
         : this.$t('user_card.mute_expires_at', [new Date(this.user.mute_expires_at).toLocaleString()])
     },
+    blockExpiryAvailable () {
+      return this.user.block_expires_at !== undefined
+    },
     blockExpiry () {
       return this.user.block_expires_at == null
         ? this.$t('user_card.block_expires_forever')
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 5e606d653..e51a16271 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -137,13 +137,13 @@
                 />
               </span>
               <span
-                v-if="relationship.muting"
+                v-if="relationship.muting && muteExpiryAvailable"
                 class="alert neutral user-role"
               >
                 {{ muteExpiry }}
               </span>
               <span
-                v-if="relationship.blocking"
+                v-if="relationship.blocking && blockExpiryAvailable"
                 class="alert neutral user-role"
               >
                 {{ blockExpiry }}