diff --git a/lib/logflare/application.ex b/lib/logflare/application.ex
index f22420c31..ccc3b122f 100644
--- a/lib/logflare/application.ex
+++ b/lib/logflare/application.ex
@@ -51,7 +51,9 @@ defmodule Logflare.Application do
          name: Logflare.V1SourceRegistry,
          keys: :unique,
          partitions: max(round(System.schedulers_online() / 8), 1)},
-        {PartitionSupervisor, child_spec: Task.Supervisor, name: Logflare.TaskSupervisors},
+        {PartitionSupervisor,
+         child_spec: {Task.Supervisor, [spawn_opt: [fullsweep_after: 1_000]]},
+         name: Logflare.TaskSupervisors},
         {DynamicSupervisor, strategy: :one_for_one, name: Logflare.Endpoints.Cache},
         {DynamicSupervisor,
          strategy: :one_for_one,
@@ -75,7 +77,9 @@ defmodule Logflare.Application do
       conditional_children() ++
       [
         Logflare.ErlSysMon,
-        {PartitionSupervisor, child_spec: Task.Supervisor, name: Logflare.TaskSupervisors},
+        {PartitionSupervisor,
+         child_spec: {Task.Supervisor, [spawn_opt: [fullsweep_after: 1_000]]},
+         name: Logflare.TaskSupervisors},
         {Cluster.Supervisor, [topologies, [name: Logflare.ClusterSupervisor]]},
         Logflare.Repo,
         Logflare.Vault,