diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index dcf9d75..9f9af6c 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -1394,7 +1394,7 @@ SELECT store_path FROM derivation_source_files WHERE id = $1"
 
 (define* (find-broken-derivations-in-revision
           commit
-          #:key (ignore-systems '()) (ignore-targets '()))
+          #:key systems targets (ignore-systems '()) (ignore-targets '()))
   (run-fibers
    (lambda ()
      (with-exception-handler
@@ -1439,10 +1439,14 @@ WHERE builder != 'builtin:download'
               (append!
                (map (lambda (system)
                       (list system ""))
-                    (list-systems conn))
+                    (if systems
+                        systems
+                        (list-systems conn)))
                (map (lambda (target)
                       (list "x86_64-linux" target))
-                    (valid-targets conn))))))))))
+                    (if targets
+                        targets
+                        (valid-targets conn)))))))))))
    #:hz 0
    #:parallelism 1
    #:drain? #t))
@@ -1537,6 +1541,8 @@ WHERE builder != 'builtin:download'
   (let ((broken-derivations
          (find-broken-derivations-in-revision
           commit
+          #:systems systems
+          #:targets targets
           #:ignore-systems ignore-systems
           #:ignore-targets ignore-targets)))
     (simple-format #t "~A broken derivations\n"