diff --git a/ui/src/core/xibo-calendar.js b/ui/src/core/xibo-calendar.js
index 68cd419d66..5b5d3b111e 100644
--- a/ui/src/core/xibo-calendar.js
+++ b/ui/src/core/xibo-calendar.js
@@ -204,7 +204,10 @@ $(document).ready(function() {
             if(calendar != undefined) {
                 let selectedDate = moment(moment($('#fromDt').val()).format(systemDateFormat));
                 // Add event to the picker to update the calendar
-                calendar.navigate('date', selectedDate);
+                // only if the selected date is valid
+                if (selectedDate.isValid()) {
+                    calendar.navigate('date', selectedDate);
+                }
             }
         };