diff --git a/app.vue b/app.vue
index afa34bb..a8c7190 100644
--- a/app.vue
+++ b/app.vue
@@ -11,10 +11,7 @@
 import "~/assets/global.css";
 const event = useRequestEvent();
 const sessionStore = useSessionStore();
-const eventsStore = useEventsStore();
-const nuxtApp = useNuxtApp();
-await callOnce("fetch-globals", async () => {
+await callOnce("fetch-session", async () => {
 	await sessionStore.fetch(event);
-	await nuxtApp.runWithContext(eventsStore.fetchLastEventId);
 })
 </script>
diff --git a/components/CardEvent.vue b/components/CardEvent.vue
index 0d90894..cec96b9 100644
--- a/components/CardEvent.vue
+++ b/components/CardEvent.vue
@@ -3,10 +3,7 @@
 	SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<section
-		class="event"
-		:class="{ cancelled: event.cancelled }"
-	>
+	<section class="event">
 		<h3>{{ event.name }}</h3>
 		<p v-if=event.host>
 			Host: {{ event.host }}
@@ -39,12 +36,7 @@
 
 		<h4>Timeslots</h4>
 		<ul>
-			<li
-				v-for="slot in event.slots.values()"
-				:key="slot.id"
-				class="slot"
-				:class="{ cancelled: slot.cancelled }"
-			>
+			<li v-for="slot in event.slots.values()" :key="slot.id">
 				{{ formatTime(slot.start) }} - {{ formatTime(slot.end) }}
 				<button
 					v-if="accountStore.valid && event.slots.size > 1"
@@ -99,10 +91,6 @@ async function toggle(type: "event" | "slot", id: number, slotIds?: number[]) {
 	padding: 0.5rem;
 	border-radius: 0.5rem;
 }
-.event.cancelled>*, .slot.cancelled {
-	text-decoration: line-through;
-	color: grey;
-}
 .event h3 {
 	margin: 0;
 }
@@ -110,9 +98,7 @@ async function toggle(type: "event" | "slot", id: number, slotIds?: number[]) {
 	margin-block-start: 0.5rem;
 }
 
-.event .notice {
-	text-decoration: none;
-	color: CanvasText;
+.notice {
 	display: flex;
 	width: fit-content;
 	gap: 0.5rem;
diff --git a/components/CardEventSlot.vue b/components/CardEventSlot.vue
index baecbb5..87c9f20 100644
--- a/components/CardEventSlot.vue
+++ b/components/CardEventSlot.vue
@@ -3,10 +3,7 @@
 	SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<section
-		class="eventSlot"
-		:class="{ cancelled: slot.cancelled || event?.cancelled }"
-	>
+	<section class="eventSlot">
 		<hgroup>
 			<h3>{{ event?.name }}</h3>
 			<p>
@@ -78,10 +75,6 @@ function formatTime(time: DateTime) {
 	padding: 0.5rem;
 	border-radius: 0.5rem;
 }
-.eventSlot.cancelled>* {
-	text-decoration: line-through;
-	color: grey;
-}
 .eventSlot h3 {
 	margin: 0;
 }
@@ -89,9 +82,7 @@ function formatTime(time: DateTime) {
 	margin-block-start: 0.5rem;
 }
 
-.eventSlot .notice {
-	text-decoration: none;
-	color: CanvasText;
+.notice {
 	display: flex;
 	width: fit-content;
 	gap: 0.5rem;
diff --git a/components/DiffSchedule.vue b/components/DiffSchedule.vue
index 5bc2541..3175d5a 100644
--- a/components/DiffSchedule.vue
+++ b/components/DiffSchedule.vue
@@ -61,7 +61,7 @@ const shifts = computed(() => {
 });
 </script>
 
-<style scoped>
+<style>
 h2 {
 	margin-block-start: 0.2rem;
 }
diff --git a/components/DiffScheduleEvent.vue b/components/DiffScheduleEvent.vue
index 959f133..6cf081e 100644
--- a/components/DiffScheduleEvent.vue
+++ b/components/DiffScheduleEvent.vue
@@ -29,12 +29,6 @@
 			:after='event.crew ? "No" : "Yes"'
 			:state
 		/>
-		<DiffFieldString
-			title="Cancelled"
-			:before='event.serverCancelled ? "Yes" : "No"'
-			:after='event.cancelled ? "Yes" : "No"'
-			:state
-		/>
 		<DiffFieldString
 			title="Notice"
 			:before="event.serverNotice"
diff --git a/components/DiffScheduleEventSlot.vue b/components/DiffScheduleEventSlot.vue
index d42df5b..f50b92a 100644
--- a/components/DiffScheduleEventSlot.vue
+++ b/components/DiffScheduleEventSlot.vue
@@ -24,12 +24,6 @@
 			:entities="schedule.locations"
 			:state
 		/>
-		<DiffFieldString
-			title="Cancelled"
-			:before='slot.serverCancelled ? "Yes" : "No"'
-			:after='slot.cancelled ? "Yes" : "No"'
-			:state
-		/>
 		<DiffFieldSetEntityId
 			title="Assigned"
 			:before="slot.serverAssigned"
diff --git a/components/LogInDemo.vue b/components/LogInDemo.vue
index fe195a3..31cdbf8 100644
--- a/components/LogInDemo.vue
+++ b/components/LogInDemo.vue
@@ -35,3 +35,7 @@ async function logIn() {
 	}
 }
 </script>
+
+<style>
+
+</style>
diff --git a/components/TableScheduleEventSlots.vue b/components/TableScheduleEventSlots.vue
index f692100..9699f79 100644
--- a/components/TableScheduleEventSlots.vue
+++ b/components/TableScheduleEventSlots.vue
@@ -12,7 +12,6 @@
 					<th>duration</th>
 					<th>event</th>
 					<th>location</th>
-					<th title="cancelled">c</th>
 					<th>assigned</th>
 					<th v-if="edit"></th>
 				</tr>
@@ -51,7 +50,6 @@
 								/>
 							</td>
 							<td></td>
-							<td></td>
 							<td>
 								Add at
 								<button
@@ -99,11 +97,6 @@
 									v-model="es.slot.locationIds"
 								/>
 							</td>
-							<td>
-								<input
-									type="checkbox"
-									v-model="es.slot.cancelled">
-							</td>
 							<td>
 								<SelectMultiEntity
 									:entities="usersStore.users"
@@ -156,7 +149,6 @@
 							/>
 						</td>
 						<td></td>
-						<td></td>
 						<td colspan="2">
 							<button
 								type="button"
@@ -185,7 +177,6 @@
 							<td>{{ es.end.diff(es.start).toFormat('hh:mm') }}</td>
 							<td>{{ es.event?.name }}</td>
 							<td></td>
-							<td>{{ es.slot.cancelled ? "x" : undefined }}</td>
 							<td><AssignedCrew :modelValue="es.slot.assigned" :edit="false" /></td>
 						</template>
 					</tr>
diff --git a/components/TableScheduleEvents.vue b/components/TableScheduleEvents.vue
index 21bfda8..caf3e48 100644
--- a/components/TableScheduleEvents.vue
+++ b/components/TableScheduleEvents.vue
@@ -14,7 +14,6 @@
 					<th>notice</th>
 					<th>description</th>
 					<th>p</th>
-					<th title="cancelled">c</th>
 					<th>s</th>
 					<th v-if="edit"></th>
 				</tr>
@@ -70,13 +69,6 @@
 								@change="event.crew = !event.crew"
 							>
 						</td>
-						<td>
-							<input
-								type="checkbox"
-								:disabled="!canEdit(event)"
-								v-model="event.cancelled"
-							>
-						</td>
 						<td>{{ event.slots.size ? event.slots.size : "" }}</td>
 						<td>
 							<button
@@ -131,7 +123,6 @@
 							>
 						</td>
 						<td></td>
-						<td></td>
 						<td>
 							<button
 								v-if="eventExists(newEventName)"
diff --git a/components/TableUsers.vue b/components/TableUsers.vue
index 7021206..789f902 100644
--- a/components/TableUsers.vue
+++ b/components/TableUsers.vue
@@ -61,3 +61,7 @@
 useEventSource();
 const usersStore = useUsersStore();
 </script>
+
+<style>
+
+</style>
diff --git a/components/Tabs.vue b/components/Tabs.vue
index 37bf429..0d2ee34 100644
--- a/components/Tabs.vue
+++ b/components/Tabs.vue
@@ -55,6 +55,7 @@ nav {
 }
 .tab {
 	display: flex;
+	flex-wrap: wrap;
 }
 .tab.active {
 	padding-block-start: 1px;
@@ -64,7 +65,6 @@ nav {
 }
 .tab .spacer {
 	flex: 1 0 0.75rem;
-	width: 0.75rem;
 }
 .tab .flap,
 .tab .spacer {
diff --git a/components/Timetable.vue b/components/Timetable.vue
index c73ae80..86e4af9 100644
--- a/components/Timetable.vue
+++ b/components/Timetable.vue
@@ -102,11 +102,7 @@
 							v-for="cell, index in row"
 							:key="index"
 							:colSpan="cell.span"
-							:class="{
-								event: cell.slot,
-								crew: cell.event?.crew,
-								cancelled: cell.event?.cancelled || cell.slot?.cancelled,
-							}"
+							:class='{"event": cell.slot, "crew": cell.event?.crew }'
 							:title="cell.event?.name"
 						>
 							{{ cell.event?.notice ? "⚠️" : undefined }}
@@ -795,9 +791,4 @@ tr.hours>th + th.dayShift div {
 .event.crew {
 	background-color: color-mix(in oklab, var(--background), rgb(127, 127, 127) 60%);
 }
-
-.event.cancelled {
-	color: color-mix(in oklab, CanvasText, rgb(127, 127, 127) 80%);
-	text-decoration: line-through;
-}
 </style>
diff --git a/composables/event-source.ts b/composables/event-source.ts
index 0e06b17..838b879 100644
--- a/composables/event-source.ts
+++ b/composables/event-source.ts
@@ -2,12 +2,12 @@
 	SPDX-FileCopyrightText: © 2025 Hornwitser <code@hornwitser.no>
 	SPDX-License-Identifier: AGPL-3.0-or-later
 */
-import type { ApiEvent, ApiEventStreamMessage } from "~/shared/types/api";
+import type { ApiEvent } from "~/shared/types/api";
 
 interface AppEventMap {
 	"open": Event,
-	"message": MessageEvent<ApiEventStreamMessage>,
-	"event": MessageEvent<ApiEvent>,
+	"message": MessageEvent<string>,
+	"update": MessageEvent<ApiEvent>,
 	"error": Event,
 	"close": Event,
 }
@@ -18,11 +18,12 @@ class AppEventSource extends EventTarget {
 
 	#forwardEvent(type: string) {
 		this.#source!.addEventListener(type, event => {
-			console.log("AppEventSource", event.type, event.data);
-			if (type === "open" || type === "error") {
+			if (type === "open" || type === "message" || type === "error") {
+				console.log("AppEventSource", event.type, event.data);
 				this.dispatchEvent(new Event(event.type));
-			} else if (type === "message") {
-				const data = event.data ? JSON.parse(event.data) as ApiEventStreamMessage : undefined;
+			} else {
+				const data = event.data ? JSON.parse(event.data) as ApiEvent : undefined;
+				console.log("AppEventSource", event.type, data);
 				if (data?.type === "connected") {
 					this.#sourceSessionId = data.session?.id;
 				}
@@ -33,27 +34,17 @@ class AppEventSource extends EventTarget {
 					source: event.source,
 					ports: [...event.ports],
 				}));
-			} else {
-				const data = event.data ? JSON.parse(event.data) as ApiEvent : undefined;
-				this.dispatchEvent(new MessageEvent(event.type, {
-					data,
-					origin: event.origin,
-					lastEventId: event.lastEventId,
-					source: event.source,
-					ports: [...event.ports],
-				}));
 			}
 		});
 	}
 
-	open(sessionId: number | undefined, lastEventId: number) {
+	open(sessionId: number | undefined) {
 		console.log("Opening event source sid:", sessionId);
 		this.#sourceSessionId = sessionId;
-		const query = new URLSearchParams({ lastEventId: String(lastEventId) });
-		this.#source = new EventSource(`/api/events?${query}`);
+		this.#source = new EventSource("/api/events");
 		this.#forwardEvent("open");
 		this.#forwardEvent("message");
-		this.#forwardEvent("event");
+		this.#forwardEvent("update");
 		this.#forwardEvent("error");
 	}
 
@@ -67,20 +58,20 @@ class AppEventSource extends EventTarget {
 	}
 
 	#connectRefs = 0;
-	connect(sessionId: number | undefined, lastEventId: number) {
+	connect(sessionId: number | undefined) {
 		this.#connectRefs += 1;
 		if (this.#source && this.#sourceSessionId !== sessionId) {
 			this.close();
 		}
 		if (!this.#source) {
-			this.open(sessionId, lastEventId);
+			this.open(sessionId);
 		}
 	}
 
-	reconnect(sessionId: number | undefined, lastEventId: number) {
+	reconnect(sessionId: number | undefined) {
 		if (this.#source && this.#sourceSessionId !== sessionId) {
 			this.close();
-			this.open(sessionId, lastEventId);
+			this.open(sessionId);
 		}
 	}
 
@@ -122,15 +113,14 @@ export const appEventSource = import.meta.client ? new AppEventSource() : null;
 
 export function useEventSource() {
 	const sessionStore = useSessionStore();
-	const eventsStore = useEventsStore();
 	onMounted(() => {
 		console.log("useEventSource onMounted", sessionStore.id);
-		appEventSource!.connect(sessionStore.id, eventsStore.lastEventId);
+		appEventSource!.connect(sessionStore.id);
 	})
 
 	watch(() => sessionStore.id, () => {
 		console.log("useEventSource sessionStore.id change", sessionStore.id);
-		appEventSource!.reconnect(sessionStore.id, eventsStore.lastEventId);
+		appEventSource!.reconnect(sessionStore.id);
 	})
 
 	onUnmounted(() => {
diff --git a/docs/dev/server-sent-events.md b/docs/dev/server-sent-events.md
index d510c1e..82ff99b 100644
--- a/docs/dev/server-sent-events.md
+++ b/docs/dev/server-sent-events.md
@@ -11,9 +11,3 @@ To update in real time this application sends a `text/event-source` stream using
 Upon connecting a `"connect"` event is emitted with the session the connection was made under. This is the primary mechanism a user agent discovers its own session having been rotated into a new one, which also happens when the access level of the account associated with the session changes.
 
 After the `"connect"` event the user agent will start to receive updates to resources it has access to that has changed. There is no filtering for what resoucres the user agent receives updates for at the moment as there's not enough events to justify the complexity of server-side subscriptions and filtering.
-
-## Id and order
-
-Events are guaranteed to be delivered in order, and to maintain consistency the server provides the following guarantee: Any entities fetched after receiving a response from `/api/last-event-id` will include updates from all events up to and including the `id` received from the response.
-
-This means that a client can fetch an up to date and live representation of any API entity by first fetching the last event from `/api/last-event-id`, and then in parallel fetch any entities as well as opening the `/api/events` stream with the `lastEventId` query param set to the value received from the `/api/last-event-id` endpoint.
diff --git a/pages/admin/index.vue b/pages/admin/index.vue
index 86a1b5f..116a189 100644
--- a/pages/admin/index.vue
+++ b/pages/admin/index.vue
@@ -109,3 +109,7 @@ const tabs = [
 	{ id: "database", title: "Database" },
 ];
 </script>
+
+<style>
+
+</style>
diff --git a/pages/admin/users/[id].vue b/pages/admin/users/[id].vue
index bf2355c..0579b44 100644
--- a/pages/admin/users/[id].vue
+++ b/pages/admin/users/[id].vue
@@ -84,7 +84,7 @@ const { pending, data, error } = await useFetch(() => `/api/users/${id.value}/de
 const userDetails = data as Ref<ApiUserDetails | ApiTombstone>;
 </script>
 
-<style scoped>
+<style>
 dl {
 	display: grid;
 	grid-template-columns: auto 1fr;
diff --git a/server/api/admin/database-export.post.ts b/server/api/admin/database-export.post.ts
index 2aff8c3..61fd34f 100644
--- a/server/api/admin/database-export.post.ts
+++ b/server/api/admin/database-export.post.ts
@@ -9,11 +9,11 @@ export default defineEventHandler(async (event) => {
 	setHeader(event, "Content-Disposition", 'attachment; filename="database-dump.json"');
 	setHeader(event, "Content-Type", "application/json; charset=utf-8");
 	return {
-		nextUserId: readNextUserId(),
-		users: readUsers(),
-		nextSessionId: readNextSessionId(),
-		sessions: readSessions(),
-		subscriptions: readSubscriptions(),
-		schedule: readSchedule(),
+		nextUserId: await readNextUserId(),
+		users: await readUsers(),
+		nextSessionId: await readNextSessionId(),
+		sessions: await readSessions(),
+		subscriptions: await readSubscriptions(),
+		schedule: await readSchedule(),
 	};
 })
diff --git a/server/api/admin/database-import-demo.post.ts b/server/api/admin/database-import-demo.post.ts
index f002fb9..cab0eae 100644
--- a/server/api/admin/database-import-demo.post.ts
+++ b/server/api/admin/database-import-demo.post.ts
@@ -7,14 +7,14 @@ import { generateDemoSchedule, generateDemoAccounts } from "~/server/generate-de
 export default defineEventHandler(async (event) => {
 	await requireServerSessionWithAdmin(event);
 	const accounts = generateDemoAccounts();
-	writeUsers(accounts);
-	writeSchedule(generateDemoSchedule());
-	writeAuthenticationMethods(accounts.map((user, index) => ({
+	await writeUsers(accounts);
+	await writeSchedule(generateDemoSchedule());
+	await writeAuthenticationMethods(accounts.map((user, index) => ({
 		id: index,
 		userId: user.id,
 		provider: "demo",
 		slug: user.name!,
 		name: user.name!,
 	})));
-	writeNextAuthenticationMethodId(Math.max(nextAuthenticationMethodId(), accounts.length));
+	await writeNextAuthenticationMethodId(Math.max(await nextAuthenticationMethodId(), accounts.length));
 })
diff --git a/server/api/admin/database-import.post.ts b/server/api/admin/database-import.post.ts
index aad3560..f4e6019 100644
--- a/server/api/admin/database-import.post.ts
+++ b/server/api/admin/database-import.post.ts
@@ -29,20 +29,20 @@ export default defineEventHandler(async (event) => {
 		});
 	}
 
-	const currentNextUserId = readNextUserId();
-	writeNextUserId(Math.max(currentNextUserId, snapshot.nextUserId));
-	writeUsers(snapshot.users);
-	const currentNextSessionId = readNextSessionId();
-	writeNextSessionId(Math.max(currentNextSessionId, snapshot.nextSessionId));
-	const currentSessions = new Map((readSessions()).map(session => [session.id, session]));
-	writeSessions(snapshot.sessions.filter(session => {
+	const currentNextUserId = await readNextUserId();
+	await writeNextUserId(Math.max(currentNextUserId, snapshot.nextUserId));
+	await writeUsers(snapshot.users);
+	const currentNextSessionId = await readNextSessionId();
+	await writeNextSessionId(Math.max(currentNextSessionId, snapshot.nextSessionId));
+	const currentSessions = new Map((await readSessions()).map(session => [session.id, session]));
+	await writeSessions(snapshot.sessions.filter(session => {
 		const current = currentSessions.get(session.id);
 		// Only keep sessions that match the account id in both sets to avoid
 		// resurrecting deleted sessions. This will still cause session cross
 		// pollution if a snapshot from another instance is loaded here.
 		return current?.accountId !== undefined && current.accountId === session.accountId;
 	}));
-	writeSubscriptions(snapshot.subscriptions);
-	writeSchedule(snapshot.schedule);
+	await writeSubscriptions(snapshot.subscriptions);
+	await writeSchedule(snapshot.schedule);
 	await sendRedirect(event, "/");
 })
diff --git a/server/api/admin/delete-database.post.ts b/server/api/admin/delete-database.post.ts
index fb2c836..395f607 100644
--- a/server/api/admin/delete-database.post.ts
+++ b/server/api/admin/delete-database.post.ts
@@ -6,5 +6,5 @@ import { deleteDatabase } from "~/server/database";
 
 export default defineEventHandler(async (event) => {
 	await requireServerSessionWithAdmin(event);
-	deleteDatabase();
+	await deleteDatabase();
 })
diff --git a/server/api/admin/user.patch.ts b/server/api/admin/user.patch.ts
index 548f924..25c559f 100644
--- a/server/api/admin/user.patch.ts
+++ b/server/api/admin/user.patch.ts
@@ -2,7 +2,7 @@
 	SPDX-FileCopyrightText: © 2025 Hornwitser <code@hornwitser.no>
 	SPDX-License-Identifier: AGPL-3.0-or-later
 */
-import { nextEventId, readSessions, readUsers, writeSessions, writeUsers } from "~/server/database";
+import { readSessions, readUsers, writeSessions, writeUsers } from "~/server/database";
 import { apiUserPatchSchema } from "~/shared/types/api";
 import { z } from "zod/v4-mini";
 import { broadcastEvent } from "~/server/streams";
@@ -18,7 +18,7 @@ export default defineEventHandler(async (event) => {
 		});
 	}
 
-	const users = readUsers();
+	const users = await readUsers();
 	const user = users.find(user => user.id === patch.id);
 	if (!user || user.deleted) {
 		throw createError({
@@ -52,28 +52,26 @@ export default defineEventHandler(async (event) => {
 		user.name = patch.name;
 	}
 	user.updatedAt = new Date().toISOString();
-	writeUsers(users);
+	await writeUsers(users);
 	broadcastEvent({
-		id: nextEventId(),
 		type: "user-update",
 		data: serverUserToApi(user),
 	});
 
 	// Rotate sessions with the user in it if the access changed
 	if (accessChanged) {
-		const sessions = readSessions();
+		const sessions = await readSessions();
 		const nowMs = Date.now();
 		for (const session of sessions) {
 			if (session.accountId === user.id) {
 				session.rotatesAtMs = nowMs;
 				broadcastEvent({
-					id: nextEventId(),
 					type: "session-expired",
 					sessionId: session.id,
 				});
 			}
 		}
-		writeSessions(sessions);
+		await writeSessions(sessions);
 	}
 
 	// Update Schedule counts.
diff --git a/server/api/auth/account.delete.ts b/server/api/auth/account.delete.ts
index fb916ea..2e66d14 100644
--- a/server/api/auth/account.delete.ts
+++ b/server/api/auth/account.delete.ts
@@ -5,17 +5,16 @@
 import {
 	readUsers, readSessions, readSubscriptions,
 	writeUsers, writeSessions, writeSubscriptions,
-	nextEventId,
 } from "~/server/database";
 import { broadcastEvent, cancelAccountStreams } from "~/server/streams";
 
 export default defineEventHandler(async (event) => {
 	const serverSession = await requireServerSessionWithUser(event);
-	let users = readUsers();
+	let users = await readUsers();
 
 	// Expire sessions for this user
 	const expiredSessionIds = new Set<number>();
-	let sessions = readSessions();
+	let sessions = await readSessions();
 	const nowMs = Date.now();
 	for (const session of sessions) {
 		if (
@@ -25,7 +24,6 @@ export default defineEventHandler(async (event) => {
 		) {
 			session.expiresAtMs = nowMs;
 			broadcastEvent({
-				id: nextEventId(),
 				type: "session-expired",
 				sessionId: session.id,
 			});
@@ -33,24 +31,23 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 	cancelAccountStreams(serverSession.accountId);
-	writeSessions(sessions);
+	await writeSessions(sessions);
 	await deleteCookie(event, "session");
 
 	// Remove subscriptions for this user
-	let subscriptions = readSubscriptions();
+	let subscriptions = await readSubscriptions();
 	subscriptions = subscriptions.filter(
 		subscription => !expiredSessionIds.has(subscription.sessionId)
 	);
-	writeSubscriptions(subscriptions);
+	await writeSubscriptions(subscriptions);
 
 	// Remove the user
 	const account = users.find(user => user.id === serverSession.accountId)!;
 	const now = new Date(nowMs).toISOString();
 	account.deleted = true;
 	account.updatedAt = now;
-	writeUsers(users);
+	await writeUsers(users);
 	await broadcastEvent({
-		id: nextEventId(),
 		type: "user-update",
 		data: {
 			id: account.id,
diff --git a/server/api/auth/account.patch.ts b/server/api/auth/account.patch.ts
index d468dcc..75c65ea 100644
--- a/server/api/auth/account.patch.ts
+++ b/server/api/auth/account.patch.ts
@@ -38,7 +38,7 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 
-	const users = readUsers();
+	const users = await readUsers();
 	const account = users.find(user => user.id === session.accountId);
 	if (!account) {
 		throw Error("Account does not exist");
@@ -70,7 +70,7 @@ export default defineEventHandler(async (event) => {
 		else
 			delete account.locale;
 	}
-	writeUsers(users);
+	await writeUsers(users);
 
 	// Update Schedule counts.
 	await updateScheduleInterestedCounts(users);
diff --git a/server/api/auth/account.post.ts b/server/api/auth/account.post.ts
index 6be7cd5..e0b3be8 100644
--- a/server/api/auth/account.post.ts
+++ b/server/api/auth/account.post.ts
@@ -2,7 +2,7 @@
 	SPDX-FileCopyrightText: © 2025 Hornwitser <code@hornwitser.no>
 	SPDX-License-Identifier: AGPL-3.0-or-later
 */
-import { readUsers, writeUsers, nextUserId, type ServerUser, readAuthenticationMethods, nextAuthenticationMethodId, writeAuthenticationMethods, nextEventId } from "~/server/database";
+import { readUsers, writeUsers, nextUserId, type ServerUser, readAuthenticationMethods, nextAuthenticationMethodId, writeAuthenticationMethods } from "~/server/database";
 import { broadcastEvent } from "~/server/streams";
 import type { ApiSession } from "~/shared/types/api";
 
@@ -18,7 +18,7 @@ export default defineEventHandler(async (event): Promise<ApiSession> => {
 	const body = await readBody(event);
 	const name = body?.name;
 
-	const users = readUsers();
+	const users = await readUsers();
 	let user: ServerUser;
 	if (typeof name === "string") {
 		if (name === "") {
@@ -36,7 +36,7 @@ export default defineEventHandler(async (event): Promise<ApiSession> => {
 
 		const firstUser = users.every(user => user.type === "anonymous");
 		user = {
-			id: nextUserId(),
+			id: await nextUserId(),
 			updatedAt: new Date().toISOString(),
 			type: firstUser ? "admin" : "regular",
 			name,
@@ -44,7 +44,7 @@ export default defineEventHandler(async (event): Promise<ApiSession> => {
 
 	} else if (name === undefined) {
 		user = {
-			id: nextUserId(),
+			id: await nextUserId(),
 			updatedAt: new Date().toISOString(),
 			type: "anonymous",
 		};
@@ -76,19 +76,18 @@ export default defineEventHandler(async (event): Promise<ApiSession> => {
 			});
 		}
 		authMethods.push({
-			id: nextAuthenticationMethodId(),
+			id: await nextAuthenticationMethodId(),
 			userId: user.id,
 			provider: session.authenticationProvider,
 			slug: session.authenticationSlug!,
 			name: session.authenticationName!,
 		})
-		writeAuthenticationMethods(authMethods);
+		await writeAuthenticationMethods(authMethods);
 	}
 
 	users.push(user);
-	writeUsers(users);
+	await writeUsers(users);
 	await broadcastEvent({
-		id: nextEventId(),
 		type: "user-update",
 		data: user,
 	});
diff --git a/server/api/auth/ap/demo-login.post.ts b/server/api/auth/ap/demo-login.post.ts
index 193c619..ffd07de 100644
--- a/server/api/auth/ap/demo-login.post.ts
+++ b/server/api/auth/ap/demo-login.post.ts
@@ -24,11 +24,11 @@ export default defineEventHandler(async (event) => {
 		});
 	}
 
-	const authMethods = readAuthenticationMethods();
+	const authMethods = await readAuthenticationMethods();
 	const method = authMethods.find(method => method.provider === "demo" && method.slug === slug);
 	let session;
 	if (method) {
-		const users = readUsers();
+		const users = await readUsers();
 		const account = users.find(user => !user.deleted && user.id === method.userId);
 		session = await setServerSession(event, account);
 	} else {
diff --git a/server/api/auth/ap/telegram-login.post.ts b/server/api/auth/ap/telegram-login.post.ts
index 062b2d7..25a610b 100644
--- a/server/api/auth/ap/telegram-login.post.ts
+++ b/server/api/auth/ap/telegram-login.post.ts
@@ -84,11 +84,11 @@ export default defineEventHandler(async (event): Promise<ApiSession> => {
 	}
 
 	const slug = String(data.authData.id);
-	const authMethods = readAuthenticationMethods();
+	const authMethods = await readAuthenticationMethods();
 	const method = authMethods.find(method => method.provider === "telegram" && method.slug === slug);
 	let session;
 	if (method) {
-		const users = readUsers();
+		const users = await readUsers();
 		const account = users.find(user => !user.deleted && user.id === method.userId);
 		session = await setServerSession(event, account);
 	} else {
diff --git a/server/api/auth/session.delete.ts b/server/api/auth/session.delete.ts
index 038476b..df4bfd9 100644
--- a/server/api/auth/session.delete.ts
+++ b/server/api/auth/session.delete.ts
@@ -8,7 +8,7 @@ import { cancelSessionStreams } from "~/server/streams";
 export default defineEventHandler(async (event) => {
 	const session = await getServerSession(event, true);
 	if (session) {
-		const users = readUsers();
+		const users = await readUsers();
 		const account = users.find(user => user.id === session.accountId);
 		if (account?.type === "anonymous") {
 			throw createError({
diff --git a/server/api/events.ts b/server/api/events.ts
index ca3d1a3..12e1f3b 100644
--- a/server/api/events.ts
+++ b/server/api/events.ts
@@ -3,47 +3,33 @@
 	SPDX-License-Identifier: AGPL-3.0-or-later
 */
 import { pipeline } from "node:stream";
-import { createEventStream } from "~/server/streams";
+import { addStream, deleteStream } from "~/server/streams";
 
 export default defineEventHandler(async (event) => {
 	const session = await getServerSession(event, false);
 
-	let lastEventId: number | undefined;
-	const lastEventIdHeader = event.headers.get("Last-Event-ID");
-	const lastEventIdQuery = getQuery(event)["lastEventId"];
-	if (lastEventIdHeader) {
-		if (!/^[0-9]{1,15}$/.test(lastEventIdHeader)) {
-			throw createError({
-				statusCode: 400,
-				statusMessage: "Bad Request",
-				message: "Malformed Last-Event-ID header",
-			});
+	const encoder = new TextEncoder();
+	const source = event.headers.get("x-forwarded-for");
+	console.log(`starting event stream for ${source}`)
+	const stream = new TransformStream<string, Uint8Array>({
+		transform(chunk, controller) {
+			controller.enqueue(encoder.encode(chunk));
+		},
+		flush(controller) {
+			console.log(`finished event stream for ${source}`);
+			deleteStream(stream.writable);
+		},
+		// @ts-expect-error experimental API
+		cancel(reason) {
+			console.log(`cancelled event stream for ${source}`);
+			deleteStream(stream.writable);
 		}
-		lastEventId = Number.parseInt(lastEventIdHeader, 10);
-	} else if (lastEventIdQuery) {
-		if (typeof lastEventIdQuery !== "string" || !/^[0-9]{1,15}$/.test(lastEventIdQuery)) {
-			throw createError({
-				statusCode: 400,
-				statusMessage: "Bad Request",
-				message: "Malformed lastEventId",
-			});
-		}
-		lastEventId = Number.parseInt(lastEventIdQuery, 10);
-	} else {
-		throw createError({
-			statusCode: 400,
-			statusMessage: "Bad Request",
-			message: "lastEventId is required",
-		});
-	}
-
-	const source = event.headers.get("x-forwarded-for") ?? "";
-	const stream = await createEventStream(event, source, lastEventId, session);
+	});
+	addStream(event, stream.writable, session);
 
 	// Workaround to properly handle stream errors. See https://github.com/unjs/h3/issues/986
 	setHeader(event, "Access-Control-Allow-Origin", "*");
 	setHeader(event, "Content-Type", "text/event-stream");
-	setHeader(event, "Cache-Control", "no-store");
-	pipeline(stream as unknown as NodeJS.ReadableStream, event.node.res, (err) => { /* ignore */ });
+	pipeline(stream.readable as unknown as NodeJS.ReadableStream, event.node.res, (err) => { /* ignore */ });
 	event._handled = true;
 });
diff --git a/server/api/last-event-id.ts b/server/api/last-event-id.ts
deleted file mode 100644
index b5193c0..0000000
--- a/server/api/last-event-id.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
-	SPDX-FileCopyrightText: © 2025 Hornwitser <code@hornwitser.no>
-	SPDX-License-Identifier: AGPL-3.0-or-later
-*/
-
-import { readEvents } from "../database";
-
-export default defineEventHandler(async (event) => {
-	const events = readEvents();
-	return events[events.length - 1]?. id ?? 0;
-});
diff --git a/server/api/schedule.patch.ts b/server/api/schedule.patch.ts
index 544f2f3..49d365b 100644
--- a/server/api/schedule.patch.ts
+++ b/server/api/schedule.patch.ts
@@ -3,7 +3,7 @@
 	SPDX-License-Identifier: AGPL-3.0-or-later
 */
 import { z } from "zod/v4-mini";
-import { nextEventId, readSchedule, writeSchedule } from "~/server/database";
+import { readSchedule, writeSchedule } from "~/server/database";
 import { broadcastEvent } from "~/server/streams";
 import { apiScheduleSchema } from "~/shared/types/api";
 import { applyUpdatesToArray } from "~/shared/utils/update";
@@ -35,7 +35,7 @@ export default defineEventHandler(async (event) => {
 		});
 	}
 
-	const schedule = readSchedule();
+	const schedule = await readSchedule();
 
 	if (schedule.deleted) {
 		throw createError({
@@ -85,9 +85,8 @@ export default defineEventHandler(async (event) => {
 		applyUpdatesToArray(update.shifts, schedule.shifts = schedule.shifts ?? []);
 	}
 
-	writeSchedule(schedule);
+	await writeSchedule(schedule);
 	await broadcastEvent({
-		id: nextEventId(),
 		type: "schedule-update",
 		updatedFrom,
 		data: update,
diff --git a/server/api/schedule.ts b/server/api/schedule.ts
index 14235cf..a9ab848 100644
--- a/server/api/schedule.ts
+++ b/server/api/schedule.ts
@@ -6,6 +6,6 @@ import { readSchedule } from "~/server/database";
 
 export default defineEventHandler(async (event) => {
 	const session = await getServerSession(event, false);
-	const schedule = readSchedule();
+	const schedule = await readSchedule();
 	return canSeeCrew(session?.access) ? schedule : filterSchedule(schedule);
 });
diff --git a/server/api/subscribe.post.ts b/server/api/subscribe.post.ts
index a12a6c4..9c4a76a 100644
--- a/server/api/subscribe.post.ts
+++ b/server/api/subscribe.post.ts
@@ -20,7 +20,7 @@ export default defineEventHandler(async (event) => {
 			message: z.prettifyError(error),
 		});
 	}
-	const subscriptions = readSubscriptions();
+	const subscriptions = await readSubscriptions();
 	const existingIndex = subscriptions.findIndex(
 		sub => sub.type === "push" && sub.sessionId === session.id
 	);
@@ -34,7 +34,7 @@ export default defineEventHandler(async (event) => {
 	} else {
 		subscriptions.push(subscription);
 	}
-	writeSubscriptions(subscriptions);
+	await writeSubscriptions(subscriptions);
 	if (existingIndex !== -1) {
 		return { message: "Existing subscription refreshed."};
 	}
diff --git a/server/api/unsubscribe.post.ts b/server/api/unsubscribe.post.ts
index 9e47e87..61a3d51 100644
--- a/server/api/unsubscribe.post.ts
+++ b/server/api/unsubscribe.post.ts
@@ -6,7 +6,7 @@ import { readSubscriptions, writeSubscriptions } from "~/server/database";
 
 export default defineEventHandler(async (event) => {
 	const session = await requireServerSessionWithUser(event);
-	const subscriptions = readSubscriptions();
+	const subscriptions = await readSubscriptions();
 	const existingIndex = subscriptions.findIndex(
 		sub => sub.type === "push" && sub.sessionId === session.id
 	);
@@ -15,6 +15,6 @@ export default defineEventHandler(async (event) => {
 	} else {
 		return { message: "No subscription registered."};
 	}
-	writeSubscriptions(subscriptions);
+	await writeSubscriptions(subscriptions);
 	return { message: "Existing subscription removed."};
 });
diff --git a/server/api/users/[id]/details.get.ts b/server/api/users/[id]/details.get.ts
index efc4c74..4c6e07d 100644
--- a/server/api/users/[id]/details.get.ts
+++ b/server/api/users/[id]/details.get.ts
@@ -13,7 +13,7 @@ const detailsSchema = z.object({
 
 export default defineEventHandler(async (event) => {
 	await requireServerSessionWithAdmin(event);
-	const users = readUsers();
+	const users = await readUsers();
 	const { success, error, data: params } = detailsSchema.safeParse(getRouterParams(event));
 	if (!success) {
 		throw createError({
diff --git a/server/api/users/index.get.ts b/server/api/users/index.get.ts
index 1a3bb86..f6365fd 100644
--- a/server/api/users/index.get.ts
+++ b/server/api/users/index.get.ts
@@ -6,7 +6,7 @@ import { readUsers } from "~/server/database"
 
 export default defineEventHandler(async (event) => {
 	const session = await requireServerSessionWithUser(event);
-	const users = readUsers();
+	const users = await readUsers();
 
 	if (session.access === "admin") {
 		return users.map(serverUserToApi);
diff --git a/server/database.ts b/server/database.ts
index b3899a8..db5226a 100644
--- a/server/database.ts
+++ b/server/database.ts
@@ -2,8 +2,8 @@
 	SPDX-FileCopyrightText: © 2025 Hornwitser <code@hornwitser.no>
 	SPDX-License-Identifier: AGPL-3.0-or-later
 */
-import { readFileSync, writeFileSync, unlinkSync } from "node:fs";
-import type { ApiAuthenticationProvider, ApiEvent, ApiSchedule, ApiSubscription, ApiUserType } from "~/shared/types/api";
+import { readFile, unlink, writeFile } from "node:fs/promises";
+import type { ApiAuthenticationProvider, ApiSchedule, ApiSubscription, ApiUserType } from "~/shared/types/api";
 import type { Id } from "~/shared/types/common";
 
 export interface ServerSession {
@@ -50,12 +50,10 @@ const sessionsPath = "data/sessions.json";
 const nextSessionIdPath = "data/next-session-id.json";
 const authMethodPath = "data/auth-method.json";
 const nextAuthenticationMethodIdPath = "data/auth-method-id.json"
-const nextEventIdPath = "data/next-event-id.json";
-const eventsPath = "data/events.json";
 
-function remove(path: string) {
+async function remove(path: string) {
 	try {
-		unlinkSync(path);
+		await unlink(path);
 	} catch (err: any) {
 		if (err.code !== "ENOENT") {
 			throw err;
@@ -63,17 +61,17 @@ function remove(path: string) {
 	}
 }
 
-export function deleteDatabase() {
-	remove(schedulePath);
-	remove(subscriptionsPath);
-	remove(usersPath);
-	remove(sessionsPath);
+export async function deleteDatabase() {
+	await remove(schedulePath);
+	await remove(subscriptionsPath);
+	await remove(usersPath);
+	await remove(sessionsPath);
 }
 
-function readJson<T>(filePath: string, fallback: T) {
+async function readJson<T>(filePath: string, fallback: T) {
 	let data: T extends () => infer R ? R : T;
 	try {
-		data = JSON.parse(readFileSync(filePath, "utf-8"));
+		data = JSON.parse(await readFile(filePath, "utf-8"));
 	} catch (err: any) {
 		if (err.code !== "ENOENT")
 			throw err;
@@ -82,19 +80,19 @@ function readJson<T>(filePath: string, fallback: T) {
 	return data;
 }
 
-export function readSchedule() {
+export async function readSchedule() {
 	return readJson(schedulePath, (): ApiSchedule => ({
 		id: 111,
 		updatedAt: new Date().toISOString(),
 	}));
 }
 
-export function writeSchedule(schedule: ApiSchedule) {
-	writeFileSync(schedulePath, JSON.stringify(schedule, undefined, "\t") + "\n", "utf-8");
+export async function writeSchedule(schedule: ApiSchedule) {
+	await writeFile(schedulePath, JSON.stringify(schedule, undefined, "\t") + "\n", "utf-8");
 }
 
-export function readSubscriptions() {
-	let subscriptions = readJson<ApiSubscription[]>(subscriptionsPath, []);
+export async function readSubscriptions() {
+	let subscriptions = await readJson<ApiSubscription[]>(subscriptionsPath, []);
 	if (subscriptions.length && "keys" in subscriptions[0]) {
 		// Discard old format
 		subscriptions = [];
@@ -102,89 +100,71 @@ export function readSubscriptions() {
 	return subscriptions;
 }
 
-export function writeSubscriptions(subscriptions: ApiSubscription[]) {
-	writeFileSync(subscriptionsPath, JSON.stringify(subscriptions, undefined, "\t") + "\n", "utf-8");
+export async function writeSubscriptions(subscriptions: ApiSubscription[]) {
+	await writeFile(subscriptionsPath, JSON.stringify(subscriptions, undefined, "\t") + "\n", "utf-8");
 }
 
-export function readNextUserId() {
-	return readJson(nextUserIdPath, 0);
+export async function readNextUserId() {
+	return await readJson(nextUserIdPath, 0);
 }
 
-export function writeNextUserId(nextId: number) {
-	writeFileSync(nextUserIdPath, String(nextId), "utf-8");
+export async function writeNextUserId(nextId: number) {
+	await writeFile(nextUserIdPath, String(nextId), "utf-8");
 }
 
-export function nextUserId() {
-	let nextId = readJson(nextUserIdPath, 0);
+export async function nextUserId() {
+	let nextId = await readJson(nextUserIdPath, 0);
 	if (nextId === 0) {
-		nextId = Math.max(...(readUsers()).map(user => user.id), -1) + 1;
+		nextId = Math.max(...(await readUsers()).map(user => user.id), -1) + 1;
 	}
-	writeFileSync(nextUserIdPath, String(nextId + 1), "utf-8");
+	await writeFile(nextUserIdPath, String(nextId + 1), "utf-8");
 	return nextId;
 }
 
-export function readUsers() {
-	return readJson(usersPath, (): ServerUser[] => []);
+export async function readUsers() {
+	return await readJson(usersPath, (): ServerUser[] => []);
 }
 
-export function writeUsers(users: ServerUser[]) {
-	writeFileSync(usersPath, JSON.stringify(users, undefined, "\t") + "\n", "utf-8");
+export async function writeUsers(users: ServerUser[]) {
+	await writeFile(usersPath, JSON.stringify(users, undefined, "\t") + "\n", "utf-8");
 }
 
-export function readNextSessionId() {
-	return readJson(nextSessionIdPath, 0);
+export async function readNextSessionId() {
+	return await readJson(nextSessionIdPath, 0);
 }
 
-export function writeNextSessionId(nextId: number) {
-	writeFileSync(nextSessionIdPath, String(nextId), "utf-8");
+export async function writeNextSessionId(nextId: number) {
+	await writeFile(nextSessionIdPath, String(nextId), "utf-8");
 }
 
-export function nextSessionId() {
-	const nextId = readJson(nextSessionIdPath, 0);
-	writeFileSync(nextSessionIdPath, String(nextId + 1), "utf-8");
+export async function nextSessionId() {
+	const nextId = await readJson(nextSessionIdPath, 0);
+	await writeFile(nextSessionIdPath, String(nextId + 1), "utf-8");
 	return nextId;
 }
 
-export function readSessions() {
+export async function readSessions() {
 	return readJson<ServerSession[]>(sessionsPath, [])
 }
 
-export function writeSessions(sessions: ServerSession[]) {
-	writeFileSync(sessionsPath, JSON.stringify(sessions, undefined, "\t") + "\n", "utf-8");
+export async function writeSessions(sessions: ServerSession[]) {
+	await writeFile(sessionsPath, JSON.stringify(sessions, undefined, "\t") + "\n", "utf-8");
 }
 
-export function nextAuthenticationMethodId() {
-	const nextId = readJson(nextAuthenticationMethodIdPath, 0);
-	writeFileSync(nextAuthenticationMethodIdPath, String(nextId + 1), "utf-8");
+export async function nextAuthenticationMethodId() {
+	const nextId = await readJson(nextAuthenticationMethodIdPath, 0);
+	await writeFile(nextAuthenticationMethodIdPath, String(nextId + 1), "utf-8");
 	return nextId;
 }
 
-export function writeNextAuthenticationMethodId(nextId: number) {
-	writeFileSync(nextAuthenticationMethodIdPath, String(nextId), "utf-8");
+export async function writeNextAuthenticationMethodId(nextId: number) {
+	await writeFile(nextAuthenticationMethodIdPath, String(nextId), "utf-8");
 }
 
-export function readAuthenticationMethods() {
+export async function readAuthenticationMethods() {
 	return readJson<ServerAuthenticationMethod[]>(authMethodPath, [])
 }
 
-export function writeAuthenticationMethods(authMethods: ServerAuthenticationMethod[]) {
-	writeFileSync(authMethodPath, JSON.stringify(authMethods, undefined, "\t") + "\n", "utf-8");
-}
-
-export function nextEventId() {
-	const nextId = readJson(nextEventIdPath, 0);
-	writeFileSync(nextEventIdPath, String(nextId + 1), "utf-8");
-	return nextId;
-}
-
-export function writeNextEventId(nextId: number) {
-	writeFileSync(nextEventIdPath, String(nextId), "utf-8");
-}
-
-export function readEvents() {
-	return readJson<ApiEvent[]>(eventsPath, [])
-}
-
-export function writeEvents(events: ApiEvent[]) {
-	writeFileSync(eventsPath, JSON.stringify(events, undefined, "\t") + "\n", "utf-8");
+export async function writeAuthenticationMethods(authMethods: ServerAuthenticationMethod[]) {
+	await writeFile(authMethodPath, JSON.stringify(authMethods, undefined, "\t") + "\n", "utf-8");
 }
diff --git a/server/streams.ts b/server/streams.ts
index dd312da..111c9a2 100644
--- a/server/streams.ts
+++ b/server/streams.ts
@@ -2,134 +2,82 @@
 	SPDX-FileCopyrightText: © 2025 Hornwitser <code@hornwitser.no>
 	SPDX-License-Identifier: AGPL-3.0-or-later
 */
-import { readEvents, writeEvents, readUsers, type ServerSession } from "~/server/database";
-import type { ApiAccount, ApiDisconnected, ApiEvent, ApiEventStreamMessage, ApiUserType } from "~/shared/types/api";
+import { readUsers, type ServerSession } from "~/server/database";
+import type { ApiAccount, ApiEvent } from "~/shared/types/api";
 import { serverSessionToApi } from "./utils/session";
 import { H3Event } from "h3";
 
-const keepaliveTimeoutMs = 45e3;
-const eventUpdateTimeMs = 1e3;
-
-class EventStream {
-	write!: (data: string) => void;
-	close!: (reason?: string) => void;
-
-	constructor(
-		public sessionId: number | undefined,
-		public accountId: number | undefined,
-		public userType: ApiUserType | undefined,
-		public rotatesAtMs: number ,
-		public lastKeepAliveMs: number,
-		public lastEventId: number,
-	) {
-	}
+function sendMessage(
+	stream: WritableStream<string>,
+	message: string,
+) {
+	const writer = stream.getWriter();
+	writer.ready
+		.then(() => writer.write(message))
+		.catch(console.error)
+		.finally(() => writer.releaseLock())
+	;
 }
 
-export async function createEventStream(
+function sendMessageAndClose(
+	stream: WritableStream<string>,
+	message: string,
+) {
+	const writer = stream.getWriter();
+	writer.ready
+		.then(() => {
+			writer.write(message);
+			writer.close();
+		}).catch(console.error)
+		.finally(() => writer.releaseLock())
+	;
+}
+
+const streams = new Map<WritableStream<string>, { sessionId?: number, accountId?: number, rotatesAtMs: number }>();
+
+let keepaliveInterval: ReturnType<typeof setInterval> | null = null
+export async function addStream(
 	event: H3Event,
-	source: string,
-	lastEventId: number,
+	stream: WritableStream<string>,
 	session?: ServerSession,
 ) {
-	const runtimeConfig = useRuntimeConfig(event);
-	const now = Date.now();
-	const events = (readEvents()).filter(e => e.id > lastEventId);
-	const users = readUsers();
-	const apiSession = session ? await serverSessionToApi(event, session) : undefined;
-	let userType: ApiAccount["type"] | undefined;
-	if (session?.accountId !== undefined) {
-		userType = users.find(a => !a.deleted && a.id === session.accountId)?.type
+	if (streams.size === 0) {
+		console.log("Starting keepalive")
+		keepaliveInterval = setInterval(sendKeepalive, 4000)
 	}
-	const stream = new EventStream(
-		session?.id,
-		session?.accountId,
-		userType,
-		session?.rotatesAtMs ?? now + runtimeConfig.sessionRotatesTimeout * 1000,
-		now,
-		events[events.length - 1]?.id ?? lastEventId,
-	);
-
-	const readableStream = new ReadableStream<Uint8Array>({
-		start(controller) {
-			const encoder = new TextEncoder();
-			stream.write = (data: string) => {
-				controller.enqueue(encoder.encode(data));
-			}
-			stream.close = (reason?: string) => {
-				const data: ApiDisconnected = {
-					type: "disconnect",
-					reason,
-				};
-				stream.write(`data: ${JSON.stringify(data)}\n\n`);
-				controller.close();
-				deleteStream(stream);
-			},
-			console.log(`Starting event stream for ${source}`)
-			addStream(stream);
-		},
-		cancel(reason) {
-			console.log(`Cancelled event stream for ${source}:`, reason);
-			deleteStream(stream);
-		}
+	const runtimeConfig = useRuntimeConfig(event);
+	streams.set(stream, {
+		sessionId: session?.id,
+		accountId: session?.accountId,
+		rotatesAtMs: session?.rotatesAtMs ?? Date.now() + runtimeConfig.sessionRotatesTimeout * 1000,
 	});
 	// Produce a response immediately to avoid the reply waiting for content.
-	const update: ApiEventStreamMessage = {
+	const update: ApiEvent = {
 		type: "connected",
-		session: apiSession,
+		session: session ? await serverSessionToApi(event, session) : undefined,
 	};
-	stream.write(`data: ${JSON.stringify(update)}\n\n`);
-
-	/*
-		Send events since the provided lastEventId
-
-		Warning: This have to happen either before addStream(stream) is
-		called, or as done here synchronously after it. Otherwise there's a
-		possibility of events being delivered out of order, which will break
-		the assumption made by the schedule updating logic.
-	*/
-	if (events.length)
-		console.log(`Sending ${events.length} event(s) to ${source}`);
-	for (const event of events) {
-		if (!sendEventToStream(stream, event)) {
-			break;
-		}
-	}
-
-	return readableStream;
+	sendMessage(stream, `event: update\ndata: ${JSON.stringify(update)}\n\n`);
 }
-
-let updateInterval: ReturnType<typeof setInterval> | null = null
-const streams = new Set<EventStream>();
-function addStream(
-	stream: EventStream,
-) {
-	if (streams.size === 0) {
-		console.log("Starting event updates")
-		updateInterval = setInterval(sendEventUpdates, eventUpdateTimeMs)
-	}
-	streams.add(stream);
-}
-function deleteStream(stream: EventStream) {
+export function deleteStream(stream: WritableStream<string>) {
 	streams.delete(stream);
 	if (streams.size === 0) {
-		console.log("Ending event updates")
-		clearInterval(updateInterval!);
-		updateInterval = null;
+		console.log("Ending keepalive")
+		clearInterval(keepaliveInterval!);
 	}
 }
 
 export function cancelAccountStreams(accountId: number) {
-	for (const stream of streams.values()) {
-		if (stream.accountId === accountId) {
-			stream.close("cancelled");
+	for (const [stream, data] of streams) {
+		if (data.accountId === accountId) {
+			sendMessageAndClose(stream, `data: cancelled\n\n`);
 		}
 	}
 }
 
 export function cancelSessionStreams(sessionId: number) {
-	for (const stream of streams.values()) {
-		if (stream.sessionId === sessionId) {
-			stream.close("cancelled");
+	for (const [stream, data] of streams) {
+		if (data.sessionId === sessionId) {
+			sendMessageAndClose(stream, `data: cancelled\n\n`);
 		}
 	}
 }
@@ -146,7 +94,6 @@ function encodeEvent(event: ApiEvent, userType: ApiAccount["type"] | undefined)
 	if (event.type === "schedule-update") {
 		if (!canSeeCrew(userType)) {
 			event = {
-				id: event.id,
 				type: event.type,
 				updatedFrom: event.updatedFrom,
 				data: filterSchedule(event.data),
@@ -159,7 +106,6 @@ function encodeEvent(event: ApiEvent, userType: ApiAccount["type"] | undefined)
 			|| !event.data.deleted && event.data.type === "anonymous" && !canSeeAnonymous(userType)
 		) {
 			event = {
-				id: event.id,
 				type: event.type,
 				data: {
 					id: event.data.id,
@@ -182,68 +128,44 @@ function encodeEvent(event: ApiEvent, userType: ApiAccount["type"] | undefined)
 }
 
 export async function broadcastEvent(event: ApiEvent) {
-	const events = readEvents();
-	events.push(event);
-	writeEvents(events);
-}
+	const id = Date.now();
+	console.log(`broadcasting update to ${streams.size} clients`);
+	if (!streams.size) {
+		return;
+	}
 
-function sendEventToStream(stream: EventStream, event: ApiEvent) {
 	// Session expiry events cause the streams belonging to that session to be terminated
 	if (event.type === "session-expired") {
-		if (stream.sessionId === event.sessionId) {
-			stream.close("session expired");
-			return false;
-		}
-		return true;
+		cancelSessionStreams(event.sessionId);
+		return;
 	}
 
-	// Account events are specially handled and only sent to the user they belong to.
-	if (event.type === "account-update") {
-		if (stream.accountId === event.data.id) {
-			stream.write(`id: ${event.id}\nevent: event\ndata: ${JSON.stringify(event)}\n\n`);
-		}
-		return true;
-	}
-
-	// All other events are encoded according to the user access level seeing it.
-	const data = encodeEvent(event, stream.userType)
-	stream.write(`id: ${event.id}\nevent: event\ndata: ${data}\n\n`);
-	return true;
-}
-
-async function sendEventUpdates() {
-	// Cancel streams that need to be rotated.
-	const now = Date.now();
-	for (const stream of streams.values()) {
-		if (stream.rotatesAtMs < now) {
-			stream.close("session rotation");
-			continue;
-		}
-	}
-
-	// Send events.
-	const skipEventId = Math.min(...[...streams.values()].map(s => s.lastEventId));
-	const events = (readEvents()).filter(e => e.id > skipEventId);
-	if (events.length)
-		console.log(`broadcasting ${events.length} event(s) to ${streams.size} client(s)`);
-	for (const stream of streams.values()) {
-		for (const event of events) {
-			if (event.id > stream.lastEventId) {
-				stream.lastEventId = event.id;
-				stream.lastKeepAliveMs = now;
-
-				if (!sendEventToStream(stream, event)) {
-					break;
-				}
+	const users = await readUsers();
+	for (const [stream, streamData] of streams) {
+		// Account events are specially handled and only sent to the user they belong to.
+		if (event.type === "account-update") {
+			if (streamData.accountId === event.data.id) {
+				sendMessage(stream, `id: ${id}\nevent: update\ndata: ${JSON.stringify(event)}\n\n`);
 			}
-		}
-	}
 
-	// Send Keepalives to streams with no activity.
-	for (const stream of streams.values()) {
-		if (stream.lastKeepAliveMs + keepaliveTimeoutMs < now) {
-			stream.write(": keepalive\n");
-			stream.lastKeepAliveMs = now;
+		} else {
+			let userType: ApiAccount["type"] | undefined;
+			if (streamData.accountId !== undefined) {
+				userType = users.find(a => !a.deleted && a.id === streamData.accountId)?.type
+			}
+			const data = encodeEvent(event, userType)
+			sendMessage(stream, `id: ${id}\nevent: update\ndata: ${data}\n\n`);
+		}
+	}
+}
+
+function sendKeepalive() {
+	const now = Date.now();
+	for (const [stream, streamData] of streams) {
+		if (streamData.rotatesAtMs > now) {
+			sendMessage(stream, ": keepalive\n");
+		} else {
+			sendMessageAndClose(stream, `data: cancelled\n\n`);
 		}
 	}
 }
diff --git a/server/utils/schedule.ts b/server/utils/schedule.ts
index 4e263a7..e0e606a 100644
--- a/server/utils/schedule.ts
+++ b/server/utils/schedule.ts
@@ -2,7 +2,7 @@
 	SPDX-FileCopyrightText: © 2025 Hornwitser <code@hornwitser.no>
 	SPDX-License-Identifier: AGPL-3.0-or-later
 */
-import { nextEventId, readSchedule, type ServerUser, writeSchedule } from '~/server/database';
+import { readSchedule, type ServerUser, writeSchedule } from '~/server/database';
 import { broadcastEvent } from '~/server/streams';
 import type { ApiSchedule, ApiTombstone } from '~/shared/types/api';
 
@@ -20,7 +20,7 @@ export async function updateScheduleInterestedCounts(users: ServerUser[]) {
 				eventSlotCounts.set(id, (eventSlotCounts.get(id) ?? 0) + 1);
 	}
 
-	const schedule = readSchedule();
+	const schedule = await readSchedule();
 	if (schedule.deleted) {
 		throw new Error("Deleted schedule not implemented");
 	}
@@ -58,7 +58,6 @@ export async function updateScheduleInterestedCounts(users: ServerUser[]) {
 	schedule.updatedAt = updatedFrom;
 	await writeSchedule(schedule);
 	await broadcastEvent({
-		id: nextEventId(),
 		type: "schedule-update",
 		updatedFrom,
 		data: update,
diff --git a/server/utils/session.ts b/server/utils/session.ts
index d56bc10..dfba536 100644
--- a/server/utils/session.ts
+++ b/server/utils/session.ts
@@ -4,7 +4,6 @@
 */
 import type { H3Event } from "h3";
 import {
-	nextEventId,
 	nextSessionId,
 	readSessions,
 	readSubscriptions,
@@ -19,11 +18,11 @@ import type { ApiAuthenticationProvider, ApiSession } from "~/shared/types/api";
 import { serverUserToApiAccount } from "./user";
 
 async function removeSessionSubscription(sessionId: number) {
-	const subscriptions = readSubscriptions();
+	const subscriptions = await readSubscriptions();
 	const index = subscriptions.findIndex(subscription => subscription.sessionId === sessionId);
 	if (index !== -1) {
 		subscriptions.splice(index, 1);
-		writeSubscriptions(subscriptions);
+		await writeSubscriptions(subscriptions);
 	}
 }
 
@@ -35,7 +34,6 @@ async function clearServerSessionInternal(event: H3Event, sessions: ServerSessio
 		if (session) {
 			session.expiresAtMs = Date.now();
 			broadcastEvent({
-				id: nextEventId(),
 				type: "session-expired",
 				sessionId,
 			});
@@ -47,9 +45,9 @@ async function clearServerSessionInternal(event: H3Event, sessions: ServerSessio
 }
 
 export async function clearServerSession(event: H3Event) {
-	const sessions = readSessions();
+	const sessions = await readSessions();
 	if (await clearServerSessionInternal(event, sessions)) {
-		writeSessions(sessions);
+		await writeSessions(sessions);
 	}
 	deleteCookie(event, "session");
 }
@@ -61,7 +59,7 @@ export async function setServerSession(
 	authenticationSlug?: string,
 	authenticationName?: string,
 ) {
-	const sessions = readSessions();
+	const sessions = await readSessions();
 	const runtimeConfig = useRuntimeConfig(event);
 	await clearServerSessionInternal(event, sessions);
 
@@ -78,14 +76,14 @@ export async function setServerSession(
 	};
 
 	sessions.push(newSession);
-	writeSessions(sessions);
+	await writeSessions(sessions);
 	await setSignedCookie(event, "session", String(newSession.id), runtimeConfig.sessionDiscardTimeout)
 	return newSession;
 }
 
 async function rotateSession(event: H3Event, sessions: ServerSession[], session: ServerSession) {
 	const runtimeConfig = useRuntimeConfig(event);
-	const users = readUsers();
+	const users = await readUsers();
 	const account = users.find(user => !user.deleted && user.id === session.accountId);
 	const now = Date.now();
 	const newSession: ServerSession = {
@@ -94,12 +92,12 @@ async function rotateSession(event: H3Event, sessions: ServerSession[], session:
 		// Authentication provider is removed to avoid possibility of an infinite delay before using it.
 		rotatesAtMs: now + runtimeConfig.sessionRotatesTimeout * 1000,
 		discardAtMs: now + runtimeConfig.sessionDiscardTimeout * 1000,
-		id: nextSessionId(),
+		id: await nextSessionId(),
 	};
 	session.successor = newSession.id;
 	session.expiresAtMs = Date.now() + 10 * 1000;
 	sessions.push(newSession);
-	writeSessions(sessions);
+	await writeSessions(sessions);
 	await setSignedCookie(event, "session", String(newSession.id), runtimeConfig.sessionDiscardTimeout)
 	return newSession;
 }
@@ -108,7 +106,7 @@ export async function getServerSession(event: H3Event, ignoreTaken: boolean) {
 	const sessionCookie = await getSignedCookie(event, "session");
 	if (sessionCookie) {
 		const sessionId = parseInt(sessionCookie, 10);
-		const sessions = readSessions();
+		const sessions = await readSessions();
 		const session = sessions.find(session => session.id === sessionId);
 		if (session) {
 			const nowMs = Date.now();
@@ -148,7 +146,7 @@ export async function requireServerSession(event: H3Event, message: string) {
 export async function requireServerSessionWithUser(event: H3Event) {
 	const message = "User session required";
 	const session = await requireServerSession(event, message);
-	const users = readUsers();
+	const users = await readUsers();
 	const account = users.find(user => user.id === session.accountId);
 	if (session.accountId === undefined || !account || account.deleted)
 		throw createError({
@@ -163,7 +161,7 @@ export async function requireServerSessionWithUser(event: H3Event) {
 export async function requireServerSessionWithAdmin(event: H3Event) {
 	const message = "Admin session required";
 	const session = await requireServerSession(event, message);
-	const users = readUsers();
+	const users = await readUsers();
 	const account = users.find(user => user.id === session.accountId);
 	if (session.access !== "admin" || account?.type !== "admin") {
 		throw createError({
@@ -176,9 +174,9 @@ export async function requireServerSessionWithAdmin(event: H3Event) {
 }
 
 export async function serverSessionToApi(event: H3Event, session: ServerSession): Promise<ApiSession> {
-	const users = readUsers();
+	const users = await readUsers();
 	const account = users.find(user => !user.deleted && user.id === session.accountId);
-	const subscriptions = readSubscriptions();
+	const subscriptions = await readSubscriptions();
 	const push = Boolean(
 		subscriptions.find(sub => sub.type === "push" && sub.sessionId === session.id)
 	);
diff --git a/server/web-push.ts b/server/web-push.ts
index ea09623..06f5216 100644
--- a/server/web-push.ts
+++ b/server/web-push.ts
@@ -33,7 +33,7 @@ async function useVapidDetails(event: H3Event) {
 export async function sendPush(event: H3Event, title: string, body: string) {
 	const vapidDetails = await useVapidDetails(event);
 	const payload = JSON.stringify({ title, body });
-	const subscriptions = readSubscriptions();
+	const subscriptions = await readSubscriptions();
 	console.log(`Sending "${payload}" to ${subscriptions.length} subscribers`);
 	const removeIndexes = [];
 	for (let index = 0; index < subscriptions.length; index += 1) {
@@ -65,7 +65,7 @@ export async function sendPush(event: H3Event, title: string, body: string) {
 		for (const index of removeIndexes) {
 			subscriptions.splice(index, 1);
 		}
-		writeSubscriptions(subscriptions);
+		await writeSubscriptions(subscriptions);
 	}
 	console.log("Push notices sent");
 }
diff --git a/shared/types/api.ts b/shared/types/api.ts
index 89355a9..b72ccb6 100644
--- a/shared/types/api.ts
+++ b/shared/types/api.ts
@@ -155,26 +155,27 @@ export interface ApiUserDetails {
 }
 
 export interface ApiAccountUpdate {
-	id: Id,
 	type: "account-update",
 	data: ApiAccount,
 }
 
+export interface ApiConnected {
+	type: "connected",
+	session?: ApiSession,
+}
+
 export interface ApiScheduleUpdate {
-	id: Id,
 	type: "schedule-update",
 	updatedFrom?: string,
 	data: ApiSchedule | ApiTombstone,
 }
 
 export interface ApiSessionExpired {
-	id: Id,
 	type: "session-expired",
 	sessionId: Id,
 }
 
 export interface ApiUserUpdate {
-	id: Id,
 	type: "user-update",
 	updatedFrom?: string,
 	data: ApiUser | ApiTombstone,
@@ -182,22 +183,8 @@ export interface ApiUserUpdate {
 
 export type ApiEvent =
 	| ApiAccountUpdate
+	| ApiConnected
 	| ApiScheduleUpdate
 	| ApiSessionExpired
 	| ApiUserUpdate
 ;
-
-export interface ApiConnected {
-	type: "connected",
-	session?: ApiSession,
-}
-
-export interface ApiDisconnected {
-	type: "disconnect",
-	reason?: string,
-}
-
-export type ApiEventStreamMessage =
-	| ApiConnected
-	| ApiDisconnected
-;
diff --git a/stores/events.ts b/stores/events.ts
deleted file mode 100644
index f02ee20..0000000
--- a/stores/events.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-	SPDX-FileCopyrightText: © 2025 Hornwitser <code@hornwitser.no>
-	SPDX-License-Identifier: AGPL-3.0-or-later
-*/
-
-export const useEventsStore = defineStore("events", () => {
-	const state = {
-		lastEventId: ref(0),
-	};
-	const getters = {
-	}
-	const actions = {
-		async fetchLastEventId() {
-			const requestFetch = useRequestFetch();
-			state.lastEventId.value = await requestFetch("/api/last-event-id");
-		}
-	}
-
-	appEventSource?.addEventListener("event", (event) => {
-		if (event.data.id !== undefined) {
-			state.lastEventId.value = event.data.id
-			return;
-		}
-	});
-
-	return {
-		...state,
-		...getters,
-		...actions,
-	};
-});
diff --git a/stores/schedules.ts b/stores/schedules.ts
index 03c903e..9d0a097 100644
--- a/stores/schedules.ts
+++ b/stores/schedules.ts
@@ -96,7 +96,7 @@ export const useSchedulesStore = defineStore("schedules", () => {
 		}
 	})
 
-	appEventSource?.addEventListener("event", (event) => {
+	appEventSource?.addEventListener("update", (event) => {
 		if (event.data.type !== "schedule-update") {
 			return;
 		}
diff --git a/stores/session.ts b/stores/session.ts
index 882a6cb..380390b 100644
--- a/stores/session.ts
+++ b/stores/session.ts
@@ -57,7 +57,7 @@ export const useSessionStore = defineStore("session", () => {
 		},
 	};
 
-	appEventSource?.addEventListener("message", (event) => {
+	appEventSource?.addEventListener("update", (event) => {
 		if (event.data.type !== "connected") {
 			return;
 		}
diff --git a/stores/users.ts b/stores/users.ts
index fdd78a3..57ae4f3 100644
--- a/stores/users.ts
+++ b/stores/users.ts
@@ -75,7 +75,7 @@ export const useUsersStore = defineStore("users", () => {
 		},
 	}
 
-	appEventSource?.addEventListener("event", (event) => {
+	appEventSource?.addEventListener("update", (event) => {
 		if (event.data.type !== "user-update") {
 			return;
 		}