diff --git a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
index 3756a66266..95486ce19d 100644
--- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
+++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
@@ -29,6 +29,8 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
     $scope.q = {
       completed_at_not_null: true
     }
+    e = new CustomEvent("flatpickr_clear");
+    window.dispatchEvent(e)
 
   $scope.clearFilters = () ->
     KeyValueMapStore.clearKeyValueMap()
diff --git a/app/views/spree/admin/orders/_filters.html.haml b/app/views/spree/admin/orders/_filters.html.haml
index 8c3cf2a9a6..b4db8dac72 100644
--- a/app/views/spree/admin/orders/_filters.html.haml
+++ b/app/views/spree/admin/orders/_filters.html.haml
@@ -4,10 +4,10 @@
       .date-range-filter.field
         = label_tag nil, t(:date_range)
         .date-range-fields
-          = text_field_tag "q[completed_at_gteq]", nil, class: 'datepicker', 'ng-model' => 'q.completed_at_gteq', :placeholder => t(:start), data: { controller: "flatpickr" }
+          = text_field_tag "q[completed_at_gteq]", nil, class: 'datepicker', 'ng-model' => 'q.completed_at_gteq', :placeholder => t(:start), data: { controller: "flatpickr", action: "flatpickr_clear@window->flatpickr#clear" }
           %span.range-divider
             %i.icon-arrow-right
-          = text_field_tag "q[completed_at_lteq]", nil, class: 'datepicker', 'ng-model' => 'q.completed_at_lteq', :placeholder => t(:stop), data: { controller: "flatpickr" }
+          = text_field_tag "q[completed_at_lteq]", nil, class: 'datepicker', 'ng-model' => 'q.completed_at_lteq', :placeholder => t(:stop), data: { controller: "flatpickr", action: "flatpickr_clear@window->flatpickr#clear"  }
       .field
         = label_tag nil, t(:status)
         %select2-watch-ng-model{'ng-model': 'q.state_eq'}
diff --git a/app/webpacker/controllers/flatpickr_controller.js b/app/webpacker/controllers/flatpickr_controller.js
index 46cfb8ea5d..93779dacbd 100644
--- a/app/webpacker/controllers/flatpickr_controller.js
+++ b/app/webpacker/controllers/flatpickr_controller.js
@@ -66,6 +66,10 @@ export default class extends Flatpickr {
     };
   }
 
+  clear(e) {
+    this.fp.setDate(null);
+  }
+
   // private
 
   onClickButtons = (index, fp) => {