diff --git a/templates/galaxy/config/galaxy_workflow_scheduler.j2 b/templates/galaxy/config/galaxy_workflow_scheduler.j2
index f89931eec..cbc7b0755 100644
--- a/templates/galaxy/config/galaxy_workflow_scheduler.j2
+++ b/templates/galaxy/config/galaxy_workflow_scheduler.j2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <workflow_schedulers default="core">
     <core id="core" />
-    <handlers assign_with="db-preassign" default="schedulers">
+    <handlers assign_with="db-skip-locked" default="schedulers">
 {% for n in range(galaxy_workflow_scheduler_count) %}
         <handler id="{{ galaxy_systemd_workflow_scheduler_prefix }}_{{ n }}" tags="schedulers"/>
 {% endfor %}