diff --git a/Changes b/Changes
index 701166fb..2300fd14 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,7 @@
   [BUG FIXES]
 
   * avoid skips that go twice past max_deferrals not being reduced
+  * move random() in TastyJobs to where it is more useful
 
 2.039010 - 2018-02-22
 
diff --git a/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm b/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
index d99bbddb..f1fb486a 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
@@ -16,8 +16,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
          ON (ds.backend = ? AND admin.device = ds.device
              AND admin.action = ANY (ds.actionset))
       WHERE admin.status = 'queued'
-        AND ds.device IS NULL
-   ORDER BY random())
+        AND ds.device IS NULL)
 
   SELECT my_jobs.*,
          CASE WHEN (my_jobs.username IS NOT NULL OR
@@ -37,7 +36,8 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
    ORDER BY job_priority DESC,
             ds.deferrals ASC NULLS FIRST,
             ds.last_defer ASC NULLS LAST,
-            device_key DESC NULLS LAST
+            device_key DESC NULLS LAST,
+            random()
    LIMIT ?
 ENDSQL
 );