diff --git a/guix-data-service/substitutes.scm b/guix-data-service/substitutes.scm
index 24b141d..54b4c9e 100644
--- a/guix-data-service/substitutes.scm
+++ b/guix-data-service/substitutes.scm
@@ -132,9 +132,10 @@
                   build-server-id
                   filtered-narinfos)))))
 
-          (loop (second (last outputs-chunk))
-                total-requested
-                total-narinfos))))))
+          (unless specific-outputs
+            (loop (false-if-exception (second (last outputs-chunk)))
+                  total-requested
+                  total-narinfos)))))))
 
 (define %substitute-query-channel #f)