diff --git a/Anvil/Tools.pm b/Anvil/Tools.pm
index be8526d2..168fccb6 100644
--- a/Anvil/Tools.pm
+++ b/Anvil/Tools.pm
@@ -834,7 +834,7 @@ sub _set_defaults
 	$anvil->data->{scancore} = {
 		timing				=>	{
 			# Delay between DB connection attempts when no databases are available?
-			agent_runtime			=>	60,
+			agent_runtime			=>	30,
 			db_retry_interval		=>	2,
 			# Delay between scans?
 			run_interval			=>	60,
diff --git a/Anvil/Tools/ScanCore.pm b/Anvil/Tools/ScanCore.pm
index 0117e581..83fd73dc 100644
--- a/Anvil/Tools/ScanCore.pm
+++ b/Anvil/Tools/ScanCore.pm
@@ -319,7 +319,7 @@ sub call_scan_agents
 	$anvil->ScanCore->_scan_directory({directory => $anvil->data->{path}{directories}{scan_agents}});
 	
 	# Now loop through the agents I found and call them.
-	my $timeout = 60;
+	my $timeout = 30;
 	if ((exists $anvil->data->{scancore}{timing}{agent_runtime}) && ($anvil->data->{scancore}{timing}{agent_runtime} =~ /^\d+$/))
 	{
 		$timeout = $anvil->data->{scancore}{timing}{agent_runtime};