diff --git a/app/post_metadata.go b/app/post_metadata.go
index b23051074b..e9481a9a7a 100644
--- a/app/post_metadata.go
+++ b/app/post_metadata.go
@@ -95,7 +95,8 @@ func (a *App) PreparePostForClient(originalPost *model.Post, isNewPost bool, isE
 	post.Metadata = &model.PostMetadata{}
 
 	if post.DeleteAt > 0 {
-		// Don't fill out metadata for deleted posts
+		// For deleted posts we don't fill out metadata nor do we return the post content
+		post.Message = ""
 		return post
 	}
 
diff --git a/app/post_metadata_test.go b/app/post_metadata_test.go
index d845ce6e4f..7084232ab9 100644
--- a/app/post_metadata_test.go
+++ b/app/post_metadata_test.go
@@ -509,6 +509,7 @@ func TestPreparePostForClient(t *testing.T) {
 		clientPost := th.App.PreparePostForClient(post, false, false)
 
 		assert.NotEqual(t, nil, clientPost.Metadata, "should've populated Metadata“")
+		assert.Equal(t, "", clientPost.Message, "should've cleaned post content")
 		assert.Nil(t, clientPost.Metadata.Reactions, "should not have populated Reactions")
 		assert.Nil(t, clientPost.Metadata.Files, "should not have populated Files")
 	})