diff --git a/lib/mix/tasks/pleroma/search/meilisearch.ex b/lib/mix/tasks/pleroma/search/meilisearch.ex
index 1fece96e5..0b86fdece 100644
--- a/lib/mix/tasks/pleroma/search/meilisearch.ex
+++ b/lib/mix/tasks/pleroma/search/meilisearch.ex
@@ -4,6 +4,7 @@
 
 defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
   require Logger
+  require Pleroma.Constants
 
   import Mix.Pleroma
   import Ecto.Query
@@ -29,7 +30,11 @@ def run(["index"]) do
 
     Pleroma.Repo.chunk_stream(
       from(Pleroma.Object,
-        where: fragment("data->>'type' = 'Note'") and fragment("LENGTH(data->>'source') > 0")
+        # Only index public posts which are notes and have some text
+        where:
+          fragment("data->>'type' = 'Note'") and
+            fragment("LENGTH(data->>'source') > 0") and
+            fragment("data->'to' \\? ?", ^Pleroma.Constants.as_public())
       ),
       200,
       :batches
@@ -51,4 +56,12 @@ def run(["index"]) do
     end)
     |> Stream.run()
   end
+
+  def run(["clear"]) do
+    start_pleroma()
+
+    endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
+
+    {:ok, _} = Pleroma.HTTP.request(:delete, "#{endpoint}/indexes/objects/documents", "", [], [])
+  end
 end
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 10b1b0120..d1d2ad9d1 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -369,6 +369,7 @@ def restrict_deactivated_users(query) do
 
   defdelegate search(user, query, options \\ []), to: Pleroma.Activity.Search
   def add_to_index(_activity), do: nil
+  def remove_from_index(_object), do: nil
 
   def direct_conversation_id(activity, for_user) do
     alias Pleroma.Conversation.Participation
diff --git a/lib/pleroma/search/meilisearch.ex b/lib/pleroma/search/meilisearch.ex
index 92e0d3429..dbe6b2d67 100644
--- a/lib/pleroma/search/meilisearch.ex
+++ b/lib/pleroma/search/meilisearch.ex
@@ -1,5 +1,6 @@
 defmodule Pleroma.Search.Meilisearch do
   require Logger
+  require Pleroma.Constants
 
   alias Pleroma.Activity
 
@@ -41,7 +42,8 @@ def search(user, query, options \\ []) do
   def add_to_index(activity) do
     object = activity.object
 
-    if activity.data["type"] == "Create" and not is_nil(object) and object.data["type"] == "Note" do
+    if activity.data["type"] == "Create" and not is_nil(object) and object.data["type"] == "Note" and
+         Pleroma.Constants.as_public() in object.data["to"] do
       data = object.data
 
       endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
@@ -57,4 +59,17 @@ def add_to_index(activity) do
       end
     end
   end
+
+  def remove_from_index(object) do
+    endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
+
+    {:ok, _} =
+      Pleroma.HTTP.request(
+        :delete,
+        "#{endpoint}/indexes/objects/documents/#{object.id}",
+        "",
+        [],
+        []
+      )
+  end
 end
diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
index 92afd5cb6..0b7be42e0 100644
--- a/lib/pleroma/web/common_api.ex
+++ b/lib/pleroma/web/common_api.ex
@@ -146,6 +146,13 @@ def delete(activity_id, user) do
          true <- User.superuser?(user) || user.ap_id == object.data["actor"],
          {:ok, delete_data, _} <- Builder.delete(user, object.data["id"]),
          {:ok, delete, _} <- Pipeline.common_pipeline(delete_data, local: true) do
+      # Also delete from search index
+      search_module = Pleroma.Config.get([Pleroma.Search, :module])
+
+      ConcurrentLimiter.limit(Pleroma.Search, fn ->
+        Task.start(fn -> search_module.remove_from_index(object) end)
+      end)
+
       {:ok, delete}
     else
       {:find_activity, _} ->