diff --git a/libgnucash/scm/price-quotes.scm b/libgnucash/scm/price-quotes.scm
index 0565000bfd..0515be00ca 100644
--- a/libgnucash/scm/price-quotes.scm
+++ b/libgnucash/scm/price-quotes.scm
@@ -199,10 +199,11 @@
          commodity-list)
 
         ;; Now translate to just what gnc-fq-helper expects.
-        (append
-         (hash-map->list cons commodity-hash)
-         (map (lambda (cmd) (cons (car cmd) (list (cdr cmd))))
-              currency-list-filtered)))))
+        (and (or (pair? currency-list-filtered) (pair? commodity-list))
+             (append
+              (hash-map->list cons commodity-hash)
+              (map (lambda (cmd) (cons (car cmd) (list (cdr cmd))))
+                   currency-list-filtered))))))
 
   (define (fq-call-data->fq-calls fq-call-data)
     ;; take an output element from book->commodity->fq-call-data and