diff --git a/Changelog.md b/Changelog.md
index 89f806ef3..d043985eb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -25,6 +25,7 @@
 * Fixed missing sidebar background in the contacts tab [#7064](https://github.com/diaspora/diaspora/pull/7064)
 * Fix tags URLs in hovercards [#7075](https://github.com/diaspora/diaspora/pull/7075)
 * Fix 500 in html requests for post interactions [#7085](https://github.com/diaspora/diaspora/pull/7085)
+* Remove whitespaces next to like link in stream [#7088](https://github.com/diaspora/diaspora/pull/7088)
 
 ## Features
 * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)
diff --git a/app/assets/templates/feedback_tpl.jst.hbs b/app/assets/templates/feedback_tpl.jst.hbs
index 724a37638..cf824d367 100644
--- a/app/assets/templates/feedback_tpl.jst.hbs
+++ b/app/assets/templates/feedback_tpl.jst.hbs
@@ -18,11 +18,11 @@
   <span>{{t "stream.like"}}</span>
 {{else}}
   <a href="#" class="like" rel='nofollow'>
-    {{#if userLike}}
-      {{t "stream.unlike"}}
-    {{else}}
-      {{t "stream.like"}}
-    {{/if}}
+    {{~#if userLike~}}
+      {{~t "stream.unlike"~}}
+    {{~else~}}
+      {{~t "stream.like"~}}
+    {{~/if~}}
   </a>
 {{/if}}
 ·