diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index 756e0afb..2adbd272 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -123,7 +123,12 @@ export default {
 			this.$root.$emit('composer-reply', this.item)
 		},
 		boost() {
-			this.$store.dispatch('postBoost', this.item)
+			if (this.item.action.values.boosted) {
+				this.$store.dispatch('postUnBoost', this.item)
+			} else {
+				this.$store.dispatch('postBoost', this.item)
+			}
+
 		}
 	}
 }
diff --git a/src/store/timeline.js b/src/store/timeline.js
index 16188ef4..050e620b 100644
--- a/src/store/timeline.js
+++ b/src/store/timeline.js
@@ -109,6 +109,16 @@ const actions = {
 			})
 		})
 	},
+	postUnBoost(context, post) {
+		return axios.delete(OC.generateUrl(`apps/social/api/v1/post/boost?postId=${post.id}`)).then((response) => {
+			context.commit('removeBoost', post)
+			// eslint-disable-next-line no-console
+			console.log('Boost deleted with token ' + response.data.result.token)
+		}).catch((error) => {
+			OC.Notification.showTemporary('Failed to delete the boost')
+			console.error('Failed to delete the boost', error)
+		})
+	},
 	refreshTimeline(context) {
 		return this.dispatch('fetchTimeline', { sinceTimestamp: Math.floor(Date.now() / 1000) + 1 })
 	},