diff --git a/src/app/events/edit/[eventID]/page.tsx b/src/app/events/edit/[eventID]/page.tsx
index a6126f0..712ba05 100644
--- a/src/app/events/edit/[eventID]/page.tsx
+++ b/src/app/events/edit/[eventID]/page.tsx
@@ -1,6 +1,7 @@
 import { ThemePicker } from '@/components/misc/theme-picker';
 import { Card, CardContent, CardHeader } from '@/components/ui/card';
 import EventForm from '@/components/forms/event-form';
+import { Suspense } from 'react';
 
 export default async function Page({
   params,
@@ -15,7 +16,9 @@ export default async function Page({
         <CardHeader className='p-0 m-0 gap-0' />
 
         <CardContent>
-          <EventForm type='edit' eventId={eventID} />
+          <Suspense>
+            <EventForm type='edit' eventId={eventID} />
+          </Suspense>
         </CardContent>
       </Card>
     </div>
diff --git a/src/app/events/new/page.tsx b/src/app/events/new/page.tsx
index 77a93c3..2db7ae2 100644
--- a/src/app/events/new/page.tsx
+++ b/src/app/events/new/page.tsx
@@ -1,6 +1,7 @@
 import { ThemePicker } from '@/components/misc/theme-picker';
 import { Card, CardContent, CardHeader } from '@/components/ui/card';
 import EventForm from '@/components/forms/event-form';
+import { Suspense } from 'react';
 
 export default function NewEvent() {
   return (
@@ -10,7 +11,9 @@ export default function NewEvent() {
         <CardHeader className='p-0 m-0 gap-0' />
 
         <CardContent>
-          <EventForm type='create' />
+          <Suspense>
+            <EventForm type='create' />
+          </Suspense>
         </CardContent>
       </Card>
     </div>