diff --git a/apps/web/components/settings/TravelScheduleModal.tsx b/apps/web/components/settings/TravelScheduleModal.tsx
index 75bd929854..e21ef6ff27 100644
--- a/apps/web/components/settings/TravelScheduleModal.tsx
+++ b/apps/web/components/settings/TravelScheduleModal.tsx
@@ -150,7 +150,7 @@ const TravelScheduleModal = ({
         <DialogFooter showDivider className="relative">
           <DialogClose />
           <Button
-            disabled={!endDate}
+            disabled={isNoEndDate ? !startDate : !startDate || !endDate}
             onClick={() => {
               createNewSchedule();
             }}>
diff --git a/packages/ui/components/form/datepicker/DatePicker.tsx b/packages/ui/components/form/datepicker/DatePicker.tsx
index 5b9817872f..26ba50f3e9 100644
--- a/packages/ui/components/form/datepicker/DatePicker.tsx
+++ b/packages/ui/components/form/datepicker/DatePicker.tsx
@@ -1,10 +1,10 @@
-import "react-calendar/dist/Calendar.css";
-import "react-date-picker/dist/DatePicker.css";
-import PrimitiveDatePicker from "react-date-picker/dist/entry.nostyle";
+import * as Popover from "@radix-ui/react-popover";
+import { format } from "date-fns";
 
-import classNames from "@calcom/lib/classNames";
+import { classNames as cn } from "@calcom/lib";
+import { Button } from "@calcom/ui";
 
-import { Icon } from "../../icon";
+import { Calendar } from "../date-range-picker/Calendar";
 
 type Props = {
   date: Date;
@@ -15,20 +15,45 @@ type Props = {
 };
 
 const DatePicker = ({ minDate, disabled, date, onDatesChange, className }: Props) => {
-  return (
-    <PrimitiveDatePicker
-      className={classNames(
-        "focus:ring-primary-500 focus:border-primary-500 border-default rounded-md border p-1 pl-2 shadow-sm sm:text-sm",
-        className
-      )}
-      calendarClassName="rounded-md"
-      clearIcon={null}
-      calendarIcon={<Icon name="calendar" className="text-subtle h-5 w-5 rounded-md" />}
-      value={date}
+  function handleDayClick(newDate: Date) {
+    onDatesChange?.(newDate ?? new Date());
+  }
+  const fromDate = minDate ?? new Date();
+  const calender = (
+    <Calendar
+      initialFocus
+      fromDate={minDate === null ? undefined : fromDate}
+      // toDate={maxDate}
+      mode="single"
+      defaultMonth={date}
+      selected={date}
+      onDayClick={(day) => handleDayClick(day)}
+      numberOfMonths={1}
       disabled={disabled}
-      onChange={onDatesChange}
     />
   );
+
+  return (
+    <div className={cn("grid gap-2", className)}>
+      <Popover.Root>
+        <Popover.Trigger asChild>
+          <Button
+            data-testid="pick-date"
+            color="secondary"
+            EndIcon="calendar"
+            className={cn("justify-between text-left font-normal", !date && "text-subtle")}>
+            {date ? <>{format(date, "LLL dd, y")}</> : <span>Pick a date</span>}
+          </Button>
+        </Popover.Trigger>
+        <Popover.Content
+          className="bg-default text-emphasis z-50 w-auto rounded-md border p-0 outline-none"
+          align="start"
+          sideOffset={4}>
+          {calender}
+        </Popover.Content>
+      </Popover.Root>
+    </div>
+  );
 };
 
 export default DatePicker;
diff --git a/packages/ui/components/form/datepicker/datepicker.test.tsx b/packages/ui/components/form/datepicker/datepicker.test.tsx
index 0c6edeb3f4..ed522f7ab1 100644
--- a/packages/ui/components/form/datepicker/datepicker.test.tsx
+++ b/packages/ui/components/form/datepicker/datepicker.test.tsx
@@ -1,44 +1,63 @@
-/* eslint-disable playwright/missing-playwright-await */
 import { render, fireEvent } from "@testing-library/react";
 import { format } from "date-fns";
 import { vi } from "vitest";
 
 import DatePicker from "./DatePicker";
 
-describe("Tests for DatePicker component", () => {
-  const date = new Date("2023-07-15");
+const onChangeMock = vi.fn();
 
-  test("Should display the selected date correctly and call the onDatesChange callback when the selected date changes", () => {
-    const mockOnDatesChange = vi.fn((changedDate: Date) => format(new Date(changedDate), "yyyy-MM-dd"));
-    const { container } = render(<DatePicker date={date} onDatesChange={mockOnDatesChange} />);
+describe("Tests for DatePicker Component", () => {
+  const testDate = new Date("2024-02-20");
 
-    const day = container.querySelector('input[name="day"]') as HTMLInputElement;
-    const dayEvent = { target: { value: "27" } };
+  test("Should render correctly with default date", () => {
+    const testDate = new Date("2024-02-20");
+    const { getByTestId } = render(<DatePicker date={testDate} />);
 
-    const month = container.querySelector('input[name="month"]') as HTMLInputElement;
-    const monthEvent = { target: { value: "06" } };
-
-    const year = container.querySelector('input[name="year"]') as HTMLInputElement;
-    const yearEvent = { target: { value: "2022" } };
-
-    fireEvent.change(day, dayEvent);
-    expect(mockOnDatesChange).toHaveReturnedWith("2023-07-27");
-
-    fireEvent.change(month, monthEvent);
-    expect(mockOnDatesChange).toHaveReturnedWith("2023-06-27");
-
-    fireEvent.change(year, yearEvent);
-    expect(mockOnDatesChange).toHaveReturnedWith("2022-06-27");
-
-    expect(mockOnDatesChange).toHaveBeenCalledTimes(3);
+    const dateButton = getByTestId("pick-date");
+    expect(dateButton).toHaveTextContent(format(testDate, "LLL dd, y"));
   });
 
-  test("Should disable the DatePicker when disabled prop is true", () => {
-    const { getByDisplayValue } = render(<DatePicker date={date} disabled />);
+  test("Should show placeholder when no date is provided", () => {
+    const { getByTestId } = render(<DatePicker date={null as unknown as Date} />);
 
-    const dateInput = getByDisplayValue(format(date, "yyyy-MM-dd")) as HTMLInputElement;
-    expect(dateInput).toBeDisabled();
+    const dateButton = getByTestId("pick-date");
+    expect(dateButton).toHaveTextContent("Pick a date");
+  });
+
+  test("Should handle date selection correctly", async () => {
+    const testDate = new Date("2024-02-20");
+    const { getByTestId, getAllByRole } = render(<DatePicker date={testDate} onDatesChange={onChangeMock} />);
+
+    const dateButton = getByTestId("pick-date");
+    fireEvent.click(dateButton);
+    const gridCells = getAllByRole("gridcell");
+    const selectedDate = gridCells.find((cell) => {
+      return cell.getAttribute("tabindex") === "0";
+    });
+
+    expect(selectedDate).toBeTruthy();
+    await expect(selectedDate).not.toHaveClass("opacity-50");
+  });
+  test("Should respect minDate prop", async () => {
+    const testDate = new Date("2024-02-20");
+    const minDate = new Date("2024-02-19");
+    const { getByTestId, getAllByRole } = render(
+      <DatePicker date={testDate} minDate={minDate} onDatesChange={onChangeMock} />
+    );
+
+    const dateButton = getByTestId("pick-date");
+    fireEvent.click(dateButton);
+
+    const disabledDates = getAllByRole("gridcell").filter((cell) => cell.classList.contains("opacity-50"));
+    expect(disabledDates.length).toBeGreaterThan(0);
+    await expect(disabledDates[0]).toHaveAttribute("disabled");
+  });
+
+  test("Should respect disabled prop", () => {
+    const { getByTestId } = render(<DatePicker date={testDate} disabled={true} />);
+
+    const dateButton = getByTestId("pick-date");
+    expect(dateButton.classList.toString()).toContain("disabled:cursor-not-allowed");
+    expect(dateButton.classList.toString()).toContain("disabled:opacity-30");
   });
 });
-
-HTMLCanvasElement.prototype.getContext = vi.fn() as never;