diff --git a/changelog.d/mix-indexer.add b/changelog.d/mix-indexer.add
new file mode 100644
index 000000000..6effb959b
--- /dev/null
+++ b/changelog.d/mix-indexer.add
@@ -0,0 +1 @@
+Permit passing --chunk and --step values to the Pleroma.Search.Indexer Mix task
diff --git a/lib/mix/tasks/pleroma/search/indexer.ex b/lib/mix/tasks/pleroma/search/indexer.ex
index 81a9fced6..2a52472f9 100644
--- a/lib/mix/tasks/pleroma/search/indexer.ex
+++ b/lib/mix/tasks/pleroma/search/indexer.ex
@@ -33,15 +33,18 @@ def run(["index" | options]) do
       OptionParser.parse(
         options,
         strict: [
-          limit: :integer
+          chunk: :integer,
+          limit: :integer,
+          step: :integer
         ]
       )
 
     start_pleroma()
 
+    chunk_size = Keyword.get(options, :chunk, 100)
     limit = Keyword.get(options, :limit, 100_000)
+    per_step = Keyword.get(options, :step, 1000)
 
-    per_step = 1000
     chunks = max(div(limit, per_step), 1)
 
     1..chunks
@@ -65,7 +68,7 @@ def run(["index" | options]) do
       IO.puts("Got #{length(ids)} activities, adding to indexer")
 
       ids
-      |> Enum.chunk_every(100)
+      |> Enum.chunk_every(chunk_size)
       |> Enum.each(fn chunk ->
         IO.puts("Adding #{length(chunk)} activities to indexing queue")