diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index f97e4299f8..812a7c47b6 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -56,7 +56,7 @@
   "cancellation_reason": "Reason for cancellation (optional)",
   "cancellation_reason_host": "Reason for cancellation",
   "cancellation_reason_placeholder": "Why are you cancelling?",
-  "notify_attendee_cancellation_reason_warning":"Cancellation reason will be shared with guests",
+  "notify_attendee_cancellation_reason_warning": "Cancellation reason will be shared with guests",
   "rejection_reason_placeholder": "Why are you rejecting?",
   "rejection_reason": "Reason for rejecting",
   "rejection_reason_title": "Reject the booking request?",
@@ -2672,7 +2672,7 @@
   "x_marked_as_no_show": "{{x}} marked as no-show",
   "x_unmarked_as_no_show": "{{x}} unmarked as no-show",
   "team_select_info": "triggers for all team event types and all team members' personal event types",
-  "team_settings_description":"Manage settings for you team",
+  "team_settings_description": "Manage settings for you team",
   "no_show_updated": "No-show status updated for attendees",
   "email_copied": "Email copied",
   "phone_number_copied": "Phone Number Copied",
@@ -2950,10 +2950,10 @@
   "internal_booking_note": "Internal Note",
   "internal_note_cancellation_reason": "Reason shared with customer (optional)",
   "internal_booking_note_description": "This note will be visible to only members of your team",
-  "internal_note_presets":"Internal Cancelation Notes Presets",
-  "internal_note_presets_description" : "Create presets for internal notes that can be applied to bookings",
-  "internal_note_presets_updated_successfully" : "Internal note presets updated successfully",
-  "add_preset" : "Add Preset",
+  "internal_note_presets": "Internal Cancelation Notes Presets",
+  "internal_note_presets_description": "Create presets for internal notes that can be applied to bookings",
+  "internal_note_presets_updated_successfully": "Internal note presets updated successfully",
+  "add_preset": "Add Preset",
   "authorize": "Authorize",
   "next": "Next",
   "hide": "Hide",
@@ -2961,5 +2961,6 @@
   "desc": "Desc",
   "verify_email": "Verify email",
   "verify_email_change": "Verify email change",
+  "end_date_not_selected": "You didn't set an end date for your OOO",
   "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
 }
diff --git a/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx b/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
index b9e26bc5cc..e04d4489a2 100644
--- a/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
+++ b/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
@@ -147,7 +147,11 @@ export const CreateOrEditOutOfOfficeEntryModal = ({
         <form
           id="create-or-edit-ooo-form"
           onSubmit={handleSubmit((data) => {
-            createOrEditOutOfOfficeEntry.mutate(data);
+            if (!data.dateRange.endDate) {
+              showToast(t("end_date_not_selected"), "error");
+            } else {
+              createOrEditOutOfOfficeEntry.mutate(data);
+            }
           })}>
           <div className="h-full px-1">
             <DialogHeader