diff --git a/src/gnome/dialog-find-transactions.c b/src/gnome/dialog-find-transactions.c
index a8a4ce2f90..986b6ae3f8 100644
--- a/src/gnome/dialog-find-transactions.c
+++ b/src/gnome/dialog-find-transactions.c
@@ -208,7 +208,10 @@ gnc_ui_find_transactions_dialog_create(GNCLedgerDisplay * orig_ledg)
 
             tRoot = gnc_book_get_template_root( gnc_get_current_book() );
             al = gnc_account_get_descendants( tRoot );
-            xaccQueryAddAccountMatch( start_q, al, QOF_GUID_MATCH_NONE, QOF_QUERY_AND );
+
+            if (g_list_length(al) != 0)
+                xaccQueryAddAccountMatch( start_q, al, QOF_GUID_MATCH_NONE, QOF_QUERY_AND );
+
             g_list_free (al);
             al = NULL;
             tRoot = NULL;
diff --git a/src/gnome/dialog-find-transactions2.c b/src/gnome/dialog-find-transactions2.c
index 65968e5839..d7b84251a8 100644
--- a/src/gnome/dialog-find-transactions2.c
+++ b/src/gnome/dialog-find-transactions2.c
@@ -209,7 +209,10 @@ gnc_ui_find_transactions_dialog_create2 (GNCLedgerDisplay2 * orig_ledg)
 
             tRoot = gnc_book_get_template_root( gnc_get_current_book() );
             al = gnc_account_get_descendants( tRoot );
-            xaccQueryAddAccountMatch( start_q, al, QOF_GUID_MATCH_NONE, QOF_QUERY_AND );
+
+            if (g_list_length(al) != 0)
+                xaccQueryAddAccountMatch( start_q, al, QOF_GUID_MATCH_NONE, QOF_QUERY_AND );
+
             g_list_free (al);
             al = NULL;
             tRoot = NULL;
diff --git a/src/register/ledger-core/gnc-ledger-display.c b/src/register/ledger-core/gnc-ledger-display.c
index 539bc58e42..2ca8c298bd 100644
--- a/src/register/ledger-core/gnc-ledger-display.c
+++ b/src/register/ledger-core/gnc-ledger-display.c
@@ -415,7 +415,10 @@ gnc_ledger_display_gl (void)
 
         tRoot = gnc_book_get_template_root( gnc_get_current_book() );
         al = gnc_account_get_descendants( tRoot );
-        xaccQueryAddAccountMatch( query, al, QOF_GUID_MATCH_NONE, QOF_QUERY_AND );
+
+        if (g_list_length(al) != 0)
+            xaccQueryAddAccountMatch( query, al, QOF_GUID_MATCH_NONE, QOF_QUERY_AND );
+
         g_list_free (al);
         al = NULL;
         tRoot = NULL;
diff --git a/src/register/ledger-core/gnc-ledger-display2.c b/src/register/ledger-core/gnc-ledger-display2.c
index 67f744bd47..bc9a371a36 100644
--- a/src/register/ledger-core/gnc-ledger-display2.c
+++ b/src/register/ledger-core/gnc-ledger-display2.c
@@ -424,7 +424,10 @@ gnc_ledger_display2_gl (void)
 
         tRoot = gnc_book_get_template_root( gnc_get_current_book() );
         al = gnc_account_get_descendants( tRoot );
-        xaccQueryAddAccountMatch( query, al, QOF_GUID_MATCH_NONE, QOF_QUERY_AND );
+
+        if (g_list_length(al) != 0)
+            xaccQueryAddAccountMatch( query, al, QOF_GUID_MATCH_NONE, QOF_QUERY_AND );
+
         g_list_free (al);
         al = NULL;
         tRoot = NULL;