diff --git a/app/(staff)/staff/schedule/page.tsx b/app/(staff)/staff/schedule/page.tsx
index 485b7d3..f1cede4 100644
--- a/app/(staff)/staff/schedule/page.tsx
+++ b/app/(staff)/staff/schedule/page.tsx
@@ -55,7 +55,7 @@ export default function StaffSchedulePage() {
   const [selectedShift, setSelectedShift] = useState<ShiftEntity | null>(null);
   const [detailOpen, setDetailOpen] = useState(false);
   const [createOpen, setCreateOpen] = useState(false);
-  const [createDate, setCreateDate] = useState<string | undefined>();
+  const [createDate, setCreateDate] = useState<Date | undefined>();
 
   const isManager = user?.role === "manager";
 
@@ -64,12 +64,12 @@ export default function StaffSchedulePage() {
     setDetailOpen(true);
   };
 
-  const handleCreateShift = (date: string) => {
+  const handleCreateShift = (date: Date) => {
     setCreateDate(date);
     setCreateOpen(true);
   };
 
-  const handleDateSelect = (date: string) => {
+  const handleDateSelect = (date: Date) => {
     // In month view on desktop, clicking a date could open create modal for managers
     if (isManager) {
       setCreateDate(date);
diff --git a/components/organisms/shift-schedule/ShiftSchedule.types.ts b/components/organisms/shift-schedule/ShiftSchedule.types.ts
index 53acdad..66e6c24 100644
--- a/components/organisms/shift-schedule/ShiftSchedule.types.ts
+++ b/components/organisms/shift-schedule/ShiftSchedule.types.ts
@@ -24,5 +24,5 @@ export interface ShiftDetailModalProps {
 export interface ShiftCreateModalProps {
   isOpen: boolean;
   onClose: () => void;
-  defaultDate?: string;
+  defaultDate?: Date;
 }