diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 7a1e6a18..cfb4fa95 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -30,7 +30,7 @@
       </div>
       <Timeline
         :label="$t('user_card.media')"
-        :disabled="!user.media_count"
+        :disabled="!media.visibleStatuses.length"
         :embedded="true" :title="$t('user_card.media')"
         timeline-name="media"
         :timeline="media"
@@ -39,13 +39,13 @@
       <Timeline
         v-if="isUs"
         :label="$t('user_card.favorites')"
-        :disabled="!user.favourites_count"
+        :disabled="!favorites.visibleStatuses.length"
         :embedded="true"
         :title="$t('user_card.favorites')"
         timeline-name="favorites"
         :timeline="favorites"
       />
-    </tab-switcher>
+    </tab-switcher> 
   </div>
   <div v-else class="panel user-profile-placeholder">
     <div class="panel-heading">
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 71744f39..828c48f9 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -115,8 +115,6 @@ export const parseUser = (data) => {
   output.locked = data.locked
   output.followers_count = data.followers_count
   output.statuses_count = data.statuses_count
-  output.favourites_count = data.favourites_count
-  output.media_count = data.media_count
   output.friends = []
   output.followers = []