diff --git a/lib/logflare/source/bigquery/schema.ex b/lib/logflare/source/bigquery/schema.ex
index 9d37c0609..4284e6570 100644
--- a/lib/logflare/source/bigquery/schema.ex
+++ b/lib/logflare/source/bigquery/schema.ex
@@ -26,7 +26,7 @@ defmodule Logflare.Source.BigQuery.Schema do
     GenServer.start_link(__MODULE__, args,
       name: name,
       spawn_opt: [
-        fullsweep_after: 20
+        fullsweep_after: 1_000
       ],
       hibernate_after: 5_000
     )
diff --git a/lib/logflare/source/recent_logs_server.ex b/lib/logflare/source/recent_logs_server.ex
index 7372d0125..ae333125e 100644
--- a/lib/logflare/source/recent_logs_server.ex
+++ b/lib/logflare/source/recent_logs_server.ex
@@ -90,13 +90,7 @@ defmodule Logflare.Source.RecentLogsServer do
 
   ## Server
   def start_link(args) do
-    GenServer.start_link(__MODULE__, args,
-      name: Backends.via_source(args[:source], __MODULE__),
-      spawn_opt: [
-        fullsweep_after: 20
-      ],
-      hibernate_after: 5_000
-    )
+    GenServer.start_link(__MODULE__, args, name: Backends.via_source(args[:source], __MODULE__))
   end
 
   ## Client