diff --git a/Changelog.md b/Changelog.md
index 11f740608..800f90c21 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@
 * Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
 
 ## Bug fixes
+* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
 
 ## Features
 
diff --git a/app/assets/javascripts/app/views/stream_post_views.js b/app/assets/javascripts/app/views/stream_post_views.js
index 31746783c..ee0968420 100644
--- a/app/assets/javascripts/app/views/stream_post_views.js
+++ b/app/assets/javascripts/app/views/stream_post_views.js
@@ -28,9 +28,11 @@ app.views.StreamPost = app.views.Post.extend({
                      ".permalink"].join(", "),
 
   initialize : function(){
-    var personId = this.model.get("author").id;
-    app.events.on("person:block:"+personId, this.remove, this);
-
+    // If we are on a user page, we don't want to remove posts on block
+    if (!app.page.model.has("profile")) {
+      var personId = this.model.get("author").id;
+      app.events.on("person:block:" + personId, this.remove, this);
+    }
     this.model.on("remove", this.remove, this);
     //subviews
     this.commentStreamView = new app.views.CommentStream({model : this.model});
diff --git a/features/desktop/blocks_user.feature b/features/desktop/blocks_user.feature
index d0beb8a8c..abf1063d0 100644
--- a/features/desktop/blocks_user.feature
+++ b/features/desktop/blocks_user.feature
@@ -18,6 +18,7 @@ Feature: Blocking a user from the stream
   Scenario: Blocking a user from the profile page
     When I am on "alice@alice.alice"'s page
     And I confirm the alert after I click on the profile block button
-    Then "All your base are belong to us!" should be post 1
+    Then I should see "Stop ignoring" within "#unblock_user_button"
+    And "All your base are belong to us!" should be post 1
     When I go to the home page
     Then I should not see any posts in my stream