diff --git a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js
index 8b2b0dfb..11f560f0 100644
--- a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js
+++ b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js
@@ -25,17 +25,20 @@ const DateRangePicker = ({ minDate, maxDate, className, onRangeChange, ...props
 
   const handleSelect = (day, minDate, maxDate) => {
     if ((maxDate && day.isAfter(maxDate, 'day')) || (minDate && day.isBefore(minDate, 'day'))) return
-    if (from && !to) {
-      if (day.isBefore(from, 'day')) {
-        setTo(from)
-        setFrom(day)
-      } else {
-        setTo(day)
-      }
-    } else {
+
+    if (from && !to && day.isBefore(from, 'day')) {
+      setTo(from)
       setFrom(day)
-      setTo(null)
+      return
     }
+
+    if (from && !to && day.isSameOrAfter(from, 'day')) {
+      setTo(day)
+      return
+    }
+
+    setFrom(day)
+    setTo(null)
   }
 
   return (
diff --git a/new-lamassu-admin/src/components/date-range-picker/Tile.js b/new-lamassu-admin/src/components/date-range-picker/Tile.js
index 395443db..d6e2e0c8 100644
--- a/new-lamassu-admin/src/components/date-range-picker/Tile.js
+++ b/new-lamassu-admin/src/components/date-range-picker/Tile.js
@@ -9,7 +9,6 @@ const { label1 } = typographyStyles
 
 const styles = {
   wrapper: {
-
     height: 26,
     display: 'flex',
     alignItems: 'center',