diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index 0a09a1c4a..642fb7d6f 100644
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -116,6 +116,73 @@ def prune_orphaned_activities(limit \\ 0, opts \\ []) when is_number(limit) do
     del_single + del_array
   end
 
+  defp deletable_objects_keeping_threads(time_deadline, limit_cnt, options) do
+    # We want to delete objects from threads where
+    # 1. the newest post is still old
+    # 2. none of the activities is local
+    # 3. none of the activities is bookmarked
+    # 4. optionally none of the posts is non-public
+    deletable_context =
+      if Keyword.get(options, :keep_non_public) do
+        Pleroma.Activity
+        |> join(:left, [a], b in Pleroma.Bookmark, on: a.id == b.activity_id)
+        |> group_by([a], fragment("? ->> 'context'::text", a.data))
+        |> having(
+          [a],
+          not fragment(
+            # Posts (checked on Create Activity) is non-public
+            "bool_or((not(?->'to' \\? ? OR ?->'cc' \\? ?)) and ? ->> 'type' = 'Create')",
+            a.data,
+            ^Pleroma.Constants.as_public(),
+            a.data,
+            ^Pleroma.Constants.as_public(),
+            a.data
+          )
+        )
+      else
+        Pleroma.Activity
+        |> join(:left, [a], b in Pleroma.Bookmark, on: a.id == b.activity_id)
+        |> group_by([a], fragment("? ->> 'context'::text", a.data))
+      end
+      |> having([a], max(a.updated_at) < ^time_deadline)
+      |> having([a], not fragment("bool_or(?)", a.local))
+      |> having([_, b], fragment("max(?::text) is null", b.id))
+      |> maybe_limit(limit_cnt)
+      |> select([a], fragment("? ->> 'context'::text", a.data))
+
+    Pleroma.Object
+    |> where([o], fragment("? ->> 'context'::text", o.data) in subquery(deletable_context))
+  end
+
+  defp deletable_objects_breaking_threads(time_deadline, limit_cnt, options) do
+    deletable =
+      if Keyword.get(options, :keep_non_public) do
+        Pleroma.Object
+        |> where(
+          [o],
+          fragment(
+            "?->'to' \\? ? OR ?->'cc' \\? ?",
+            o.data,
+            ^Pleroma.Constants.as_public(),
+            o.data,
+            ^Pleroma.Constants.as_public()
+          )
+        )
+      else
+        Pleroma.Object
+      end
+      |> where([o], o.updated_at < ^time_deadline)
+      |> where(
+        [o],
+        fragment("split_part(?->>'actor', '/', 3) != ?", o.data, ^Pleroma.Web.Endpoint.host())
+      )
+      |> maybe_limit(limit_cnt)
+      |> select([o], o.id)
+
+    Pleroma.Object
+    |> where([o], o.id in subquery(deletable))
+  end
+
   def run(["remove_embedded_objects" | args]) do
     {options, [], []} =
       OptionParser.parse(
@@ -251,68 +318,9 @@ def run(["prune_objects" | args]) do
 
     {del_obj, _} =
       if Keyword.get(options, :keep_threads) do
-        # We want to delete objects from threads where
-        # 1. the newest post is still old
-        # 2. none of the activities is local
-        # 3. none of the activities is bookmarked
-        # 4. optionally none of the posts is non-public
-        deletable_context =
-          if Keyword.get(options, :keep_non_public) do
-            Pleroma.Activity
-            |> join(:left, [a], b in Pleroma.Bookmark, on: a.id == b.activity_id)
-            |> group_by([a], fragment("? ->> 'context'::text", a.data))
-            |> having(
-              [a],
-              not fragment(
-                # Posts (checked on Create Activity) is non-public
-                "bool_or((not(?->'to' \\? ? OR ?->'cc' \\? ?)) and ? ->> 'type' = 'Create')",
-                a.data,
-                ^Pleroma.Constants.as_public(),
-                a.data,
-                ^Pleroma.Constants.as_public(),
-                a.data
-              )
-            )
-          else
-            Pleroma.Activity
-            |> join(:left, [a], b in Pleroma.Bookmark, on: a.id == b.activity_id)
-            |> group_by([a], fragment("? ->> 'context'::text", a.data))
-          end
-          |> having([a], max(a.updated_at) < ^time_deadline)
-          |> having([a], not fragment("bool_or(?)", a.local))
-          |> having([_, b], fragment("max(?::text) is null", b.id))
-          |> maybe_limit(limit_cnt)
-          |> select([a], fragment("? ->> 'context'::text", a.data))
-
-        Pleroma.Object
-        |> where([o], fragment("? ->> 'context'::text", o.data) in subquery(deletable_context))
+        deletable_objects_keeping_threads(time_deadline, limit_cnt, options)
       else
-        deletable =
-          if Keyword.get(options, :keep_non_public) do
-            Pleroma.Object
-            |> where(
-              [o],
-              fragment(
-                "?->'to' \\? ? OR ?->'cc' \\? ?",
-                o.data,
-                ^Pleroma.Constants.as_public(),
-                o.data,
-                ^Pleroma.Constants.as_public()
-              )
-            )
-          else
-            Pleroma.Object
-          end
-          |> where([o], o.updated_at < ^time_deadline)
-          |> where(
-            [o],
-            fragment("split_part(?->>'actor', '/', 3) != ?", o.data, ^Pleroma.Web.Endpoint.host())
-          )
-          |> maybe_limit(limit_cnt)
-          |> select([o], o.id)
-
-        Pleroma.Object
-        |> where([o], o.id in subquery(deletable))
+        deletable_objects_breaking_threads(time_deadline, limit_cnt, options)
       end
       |> Repo.delete_all(timeout: :infinity)