diff --git a/components/event/DateRange.vue b/components/event/DateRange.vue
index 148f6de1..216d81b2 100644
--- a/components/event/DateRange.vue
+++ b/components/event/DateRange.vue
@@ -4,7 +4,7 @@ import { format, parseISO, isSameDay, isSameMonth, isSameYear } from 'date-fns'
 
 const props = defineProps<{
   start: string | Date
-  end: string | Date
+  end?: string | Date | null
   formatString?: string
 }>()
 
@@ -12,12 +12,21 @@ const parse = (date: string | Date) =>
   typeof date === 'string' ? parseISO(date) : date
 
 const startDate = computed(() => parse(props.start))
-const endDate = computed(() => parse(props.end))
+const endDate = computed(() =>
+  props.end != null && props.end !== ''
+    ? parse(props.end as string | Date)
+    : null
+)
+
+const isOpenEnd = computed(() => endDate.value === null)
 
 const formattedRange = computed(() => {
   const s = startDate.value
   const e = endDate.value
 
+  if (e == null) {
+    return format(s, props.formatString || 'MMM d, yyyy')
+  }
   if (isSameDay(s, e)) {
     return format(s, props.formatString || 'MMM d, yyyy')
   } else if (isSameMonth(s, e)) {
@@ -31,5 +40,8 @@ const formattedRange = computed(() => {
 </script>
 
 <template>
-  <span>{{ formattedRange }}</span>
+  <span>
+    {{ formattedRange }}
+    <span v-if="isOpenEnd" class="text-muted-foreground">(open end)</span>
+  </span>
 </template>
diff --git a/components/event/EventView.vue b/components/event/EventView.vue
index 8dc68524..f4bb544e 100644
--- a/components/event/EventView.vue
+++ b/components/event/EventView.vue
@@ -299,9 +299,11 @@ const navigation = computed(() => [
                   </div>
                   <div>
                     <div class="font-medium">
-                      {{ getDateTime(event.endDate) }}
+                      {{ event.endDate ? getDateTime(event.endDate) : 'Open end' }}
+                    </div>
+                    <div class="text-muted-foreground">
+                      {{ event.endDate ? 'End' : 'No end time' }}
                     </div>
-                    <div class="text-muted-foreground">End</div>
                   </div>
                 </div>
               </div>
diff --git a/components/event/edit/EventAboutEditor.vue b/components/event/edit/EventAboutEditor.vue
index 4e567876..c2d22720 100644
--- a/components/event/edit/EventAboutEditor.vue
+++ b/components/event/edit/EventAboutEditor.vue
@@ -28,7 +28,7 @@ const schema = z.object({
   cover: z.string().optional().default(''),
   status: statusSchema,
   startDate: z.string().optional(),
-  endDate: z.string().optional(),
+  endDate: z.string().optional().nullable(),
   type: z.string().optional().default('Party'),
   venue: z
     .object({
@@ -186,7 +186,7 @@ const askToDelete = () => {
 
       <FormField v-slot="{ componentField }" name="startDate">
         <FormItem class="flex flex-col justify-start">
-          <FormLabel>Start</FormLabel>
+          <FormLabel>Start Date</FormLabel>
           <FormControl>
             <DateInput v-bind="componentField" />
           </FormControl>
@@ -194,12 +194,31 @@ const askToDelete = () => {
         </FormItem>
       </FormField>
 
-      <FormField v-slot="{ componentField }" name="endDate">
-        <FormItem class="flex flex-col justify-start">
-          <FormLabel>End</FormLabel>
-          <FormControl>
-            <DateInput v-bind="componentField" :min-date="event.startDate" />
-          </FormControl>
+      <FormField v-slot="{ value: endDateValue, setValue: setEndDate }" name="endDate">
+        <FormItem class="flex flex-col justify-start space-y-3">
+          <div class="flex items-center gap-2">
+            <Checkbox
+              :id="'open-end-' + event?.id"
+              :checked="endDateValue == null || endDateValue === ''"
+              @update:checked="(checked) => setEndDate(checked ? null : undefined)"
+            />
+            <FormLabel
+              :for="'open-end-' + event?.id"
+              class="text-sm font-normal cursor-pointer"
+            >
+              Open end party (no end date/time)
+            </FormLabel>
+          </div>
+          <template v-if="endDateValue != null && endDateValue !== ''">
+            <FormLabel>End date</FormLabel>
+            <FormControl>
+              <DateInput
+                :model-value="endDateValue"
+                @update:model-value="setEndDate"
+                :min-date="event.startDate"
+              />
+            </FormControl>
+          </template>
           <FormMessage />
         </FormItem>
       </FormField>
diff --git a/server/trpc/routers/events.ts b/server/trpc/routers/events.ts
index 015a8d0d..7e266773 100644
--- a/server/trpc/routers/events.ts
+++ b/server/trpc/routers/events.ts
@@ -278,7 +278,7 @@ export const eventsRouter = router({
         cover: z.string().optional(),
         status: z.string().optional(),
         startDate: z.string().optional(),
-        endDate: z.string().optional(),
+        endDate: z.string().optional().nullable(),
         type: z.string().optional(),
         venue: z
           .object({
@@ -311,7 +311,12 @@ export const eventsRouter = router({
         data: {
           ...data,
           startDate: data.startDate ? new Date(data.startDate) : undefined,
-          endDate: data.endDate ? new Date(data.endDate) : undefined,
+          endDate:
+            data.endDate === null || data.endDate === ''
+              ? null
+              : data.endDate
+                ? new Date(data.endDate)
+                : undefined,
           venueId: venue?.id,
           organizerId: organizer?.id,
           styles: stylesData,