diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index cf7e7b7f92..c904c43387 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -2241,8 +2241,9 @@ sub GetHistory {
 
     $query .= " WHERE 1 ";
 
-    $query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') "
-        if not $get_canceled_order or ( defined $orderstatus and $orderstatus ne 'cancelled' );
+    unless ($get_canceled_order or (defined $orderstatus and $orderstatus eq 'cancelled')) {
+        $query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') ";
+    }
 
     my @query_params  = ();
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index 54d19d08c3..56451ac443 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -52,7 +52,7 @@
             <label for="orderstatus">Order status: </label>
             <select name="orderstatus" id="orderstatus">
                 [% IF orderstatus == "" %]
-                  <option value=""></option>
+                  <option value="">Any status except cancelled</option>
                 [% ELSE %]
                   <option value="" selected="selected"></option>
                 [% END %]