diff --git a/components/DatePicker/Screen/Desktop.tsx b/components/DatePicker/Screen/Desktop.tsx
index e8eff756f..192f8a036 100644
--- a/components/DatePicker/Screen/Desktop.tsx
+++ b/components/DatePicker/Screen/Desktop.tsx
@@ -60,7 +60,8 @@ export default function DatePickerDesktop({
       lang={lang}
       locale={locale}
       mode="range"
-      onDayClick={(day) => handleOnSelect(day)}
+      numberOfMonths={2}
+      onDayClick={handleOnSelect}
       pagedNavigation
       required={false}
       selected={selectedDate}
diff --git a/components/DatePicker/Screen/Mobile.tsx b/components/DatePicker/Screen/Mobile.tsx
index a91176b93..0407f9b63 100644
--- a/components/DatePicker/Screen/Mobile.tsx
+++ b/components/DatePicker/Screen/Mobile.tsx
@@ -78,7 +78,7 @@ export default function DatePickerMobile({
       mode="range"
       /** Showing full year or what's left of it */
       numberOfMonths={12}
-      onDayClick={(day) => handleOnSelect(day)}
+      onDayClick={handleOnSelect}
       required
       selected={selectedDate}
       startMonth={startMonth}
diff --git a/components/DatePicker/index.tsx b/components/DatePicker/index.tsx
index bd19f684f..818b7fb71 100644
--- a/components/DatePicker/index.tsx
+++ b/components/DatePicker/index.tsx
@@ -38,15 +38,16 @@ export default function DatePickerForm({
 
   function close() {
     setIsOpen(false)
-    onToggleOpen && onToggleOpen(false)
+    if (onToggleOpen) {
+      onToggleOpen(false)
+    }
   }
 
   function handleOnClick() {
-    setIsOpen((prevIsOpen) => {
-      const newState = !prevIsOpen
-      onToggleOpen && onToggleOpen(newState)
-      return newState
-    })
+    setIsOpen((prevIsOpen) => !prevIsOpen)
+    if (onToggleOpen) {
+      onToggleOpen(!isOpen)
+    }
   }
 
   function handleSelectDate(selected: Date) {
@@ -64,13 +65,13 @@ export default function DatePickerForm({
           from: selectedDate.from,
           to: toDate.format("YYYY-MM-DD"),
         })
-        setIsSelectingFrom(true)
       } else {
         setValue(name, {
           from: toDate.format("YYYY-MM-DD"),
           to: selectedDate.from,
         })
       }
+      setIsSelectingFrom(true)
     }
   }
 
@@ -79,7 +80,9 @@ export default function DatePickerForm({
       const target = evt.target as HTMLElement
       if (ref.current && target && !ref.current.contains(target)) {
         setIsOpen(false)
-        onToggleOpen && onToggleOpen(false)
+        if (onToggleOpen) {
+          onToggleOpen(false)
+        }
       }
     }
     document.body.addEventListener("click", handleClickOutside)
@@ -91,7 +94,9 @@ export default function DatePickerForm({
   const selectedFromDate = dt(selectedDate.from)
     .locale(lang)
     .format("ddd D MMM")
-  const selectedToDate = dt(selectedDate.to).locale(lang).format("ddd D MMM")
+  const selectedToDate = !!selectedDate.to
+    ? dt(selectedDate.to).locale(lang).format("ddd D MMM")
+    : ""
 
   return (
     <div className={styles.container} data-isopen={isOpen} ref={ref}>
diff --git a/components/Forms/BookingWidget/FormContent/index.tsx b/components/Forms/BookingWidget/FormContent/index.tsx
index 187013c0d..1175ae012 100644
--- a/components/Forms/BookingWidget/FormContent/index.tsx
+++ b/components/Forms/BookingWidget/FormContent/index.tsx
@@ -41,7 +41,7 @@ export default function FormContent({
             <Caption color="red" textTransform="bold">
               {intl.formatMessage(
                 { id: "booking.nights" },
-                { totalNights: nights }
+                { totalNights: nights > 0 ? nights : 0 }
               )}
             </Caption>
             <DatePicker onToggleOpen={setIsDatePickerOpen} />