diff --git a/app/logical/post_sets/favorite.rb b/app/logical/post_sets/favorite.rb
index b0d051260..f5bae6a00 100644
--- a/app/logical/post_sets/favorite.rb
+++ b/app/logical/post_sets/favorite.rb
@@ -6,6 +6,10 @@ module PostSets
       @params = params
       @user = ::User.find(user_id)
       @favorites = ::Favorite.for_user(user.id).paginate(page, :limit => limit).order("favorites.id desc")
+
+      if CurrentUser.user.hide_deleted_posts?
+        @favorites = @favorites.where("is_deleted = false")
+      end
     end
 
     def limit
diff --git a/app/models/tag_subscription.rb b/app/models/tag_subscription.rb
index d745ff9aa..dcc3c297e 100644
--- a/app/models/tag_subscription.rb
+++ b/app/models/tag_subscription.rb
@@ -124,7 +124,13 @@ class TagSubscription < ActiveRecord::Base
   end
 
   def self.find_posts(user_id, name = nil, limit = Danbooru.config.tag_subscription_post_limit)
-    Post.where(["id in (?)", find_post_ids(user_id, name, limit)]).order("id DESC").limit(limit)
+    arel = Post.where(["id in (?)", find_post_ids(user_id, name, limit)])
+
+    if CurrentUser.user.hide_deleted_posts?
+      arel = arel.where("is_deleted = false")
+    end
+
+    arel.order("id DESC").limit(limit)
   end
 
   def self.process_all