diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index c9197a1c..7414e573 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -6,8 +6,10 @@ const UserProfile = {
   created () {
     this.$store.commit('clearTimeline', { timeline: 'user' })
     this.$store.commit('clearTimeline', { timeline: 'favorites' })
+    this.$store.commit('clearTimeline', { timeline: 'media' })
     this.$store.dispatch('startFetching', ['user', this.fetchBy])
     this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
+    this.$store.dispatch('startFetching', ['media', this.fetchBy])
     if (!this.user.id) {
       this.$store.dispatch('fetchUser', this.fetchBy)
     }
@@ -15,6 +17,7 @@ const UserProfile = {
   destroyed () {
     this.$store.dispatch('stopFetching', 'user')
     this.$store.dispatch('stopFetching', 'favorites')
+    this.$store.dispatch('stopFetching', 'media')
   },
   computed: {
     timeline () {
@@ -23,6 +26,9 @@ const UserProfile = {
     favorites () {
       return this.$store.state.statuses.timelines.favorites
     },
+    media () {
+      return this.$store.state.statuses.timelines.media
+    },
     userId () {
       return this.$route.params.id || this.user.id
     },
@@ -78,10 +84,13 @@ const UserProfile = {
       }
       this.$store.dispatch('stopFetching', 'user')
       this.$store.dispatch('stopFetching', 'favorites')
+      this.$store.dispatch('stopFetching', 'media')
       this.$store.commit('clearTimeline', { timeline: 'user' })
       this.$store.commit('clearTimeline', { timeline: 'favorites' })
+      this.$store.commit('clearTimeline', { timeline: 'media' })
       this.$store.dispatch('startFetching', ['user', this.fetchBy])
       this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
+      this.$store.dispatch('startFetching', ['media', this.fetchBy])
     },
     userId () {
       if (!this.isExternal) {
@@ -89,10 +98,13 @@ const UserProfile = {
       }
       this.$store.dispatch('stopFetching', 'user')
       this.$store.dispatch('stopFetching', 'favorites')
+      this.$store.dispatch('stopFetching', 'media')
       this.$store.commit('clearTimeline', { timeline: 'user' })
       this.$store.commit('clearTimeline', { timeline: 'favorites' })
+      this.$store.commit('clearTimeline', { timeline: 'media' })
       this.$store.dispatch('startFetching', ['user', this.fetchBy])
       this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
+      this.$store.dispatch('startFetching', ['media', this.fetchBy])
     },
     user () {
       if (this.user.id && !this.user.followers) {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index d64ce277..74cd9c53 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -20,6 +20,7 @@
           <i class="icon-spin3 animate-spin"></i>
         </div>
       </div>
+      <Timeline :label="$t('user_card.media')" :embedded="true" :title="$t('user_profile.media_title')" timeline-name="media" :timeline="media" :user-id="fetchBy" />
       <Timeline v-if="isUs" :label="$t('user_card.favorites')" :embedded="true" :title="$t('user_profile.favorites_title')" timeline-name="favorites" :timeline="favorites"/>
     </tab-switcher>
   </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 3c29a17e..3ff98ab0 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -335,6 +335,7 @@
     "following": "Following!",
     "follows_you": "Follows you!",
     "its_you": "It's you!",
+    "media": "Media",
     "mute": "Mute",
     "muted": "Muted",
     "per_day": "per day",
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 20a8d2eb..3d6ea2f7 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -37,6 +37,7 @@ export const defaultState = {
     public: emptyTl(),
     user: emptyTl(),
     favorites: emptyTl(),
+    media: emptyTl(),
     publicAndExternal: emptyTl(),
     friends: emptyTl(),
     tag: emptyTl(),