diff --git a/src/app/requests.ts b/src/app/requests.ts
index 3d9bdae..b0ae298 100644
--- a/src/app/requests.ts
+++ b/src/app/requests.ts
@@ -185,8 +185,6 @@ export const makeCalendarFeed = ({
     events.update($events => $events.filter(e => !ids.includes(e.id)))
   }
 
-  const handleDelete = (e: TrustedEvent) => removeEvents(getTagValues(["e", "a"], e.tags))
-
   const onThunk = (thunk: Thunk) => {
     if (matchFilters(feedFilters, thunk.event)) {
       insertEvent(thunk.event)
@@ -194,8 +192,6 @@ export const makeCalendarFeed = ({
       thunk.controller.signal.addEventListener("abort", () => {
         removeEvents([thunk.event.id])
       })
-    } else if (thunk.event.kind === DELETE) {
-      handleDelete(thunk.event)
     }
   }
 
@@ -204,7 +200,6 @@ export const makeCalendarFeed = ({
     filters: subscriptionFilters,
     onEvent: (e: TrustedEvent) => {
       if (matchFilters(feedFilters, e)) insertEvent(e)
-      if (e.kind === DELETE) handleDelete(e)
     },
   })
 
diff --git a/src/routes/spaces/[relay]/calendar/+page.svelte b/src/routes/spaces/[relay]/calendar/+page.svelte
index 5e3ca70..0c9c955 100644
--- a/src/routes/spaces/[relay]/calendar/+page.svelte
+++ b/src/routes/spaces/[relay]/calendar/+page.svelte
@@ -62,6 +62,10 @@
   let initialScrollDone = false
 
   $effect(() => {
+    if (items.length === 0) {
+      return
+    }
+
     if (initialScrollDone) {
       // If new events are prepended, adjust the scroll position so that the viewport content remains anchored
       if (prevFirstEventId && items[0].event.id !== prevFirstEventId) {
@@ -72,7 +76,7 @@
           element.scrollTop += delta
         }
       }
-    } else if (items.length > 0) {
+    } else {
       const {event} = items.find(({event}) => getStart(event) >= now()) || last(items)
       const {offsetTop, clientHeight} = document.querySelector(
         ".calendar-event-" + event.id,
@@ -83,10 +87,8 @@
       initialScrollDone = true
     }
 
-    if (items.length > 0) {
-      previousScrollHeight = element.scrollHeight
-      prevFirstEventId = items[0].event.id
-    }
+    previousScrollHeight = element.scrollHeight
+    prevFirstEventId = items[0].event.id
   })
 
   onMount(() => {