diff --git a/packages/app/src/context.ts b/packages/app/src/context.ts
index 500d196..4d67426 100644
--- a/packages/app/src/context.ts
+++ b/packages/app/src/context.ts
@@ -11,6 +11,7 @@ import type {Router} from './router'
 export type AppContext = {
   router: Router
   requestDelay: number
+  authTimeout: number
   requestTimeout: number
   dufflepudUrl?: string
 }
@@ -41,6 +42,7 @@ export const getDefaultNetContext = (overrides: Partial<NetContext> = {}) => ({
 export const getDefaultAppContext = (overrides: Partial<AppContext> = {}) => ({
   router: makeRouter(),
   requestDelay: 50,
+  authTimeout: 300,
   requestTimeout: 3000,
   ...overrides,
 })
diff --git a/packages/app/src/core.ts b/packages/app/src/core.ts
index 603bd78..1e285ef 100644
--- a/packages/app/src/core.ts
+++ b/packages/app/src/core.ts
@@ -42,7 +42,8 @@ export const subscribe = (request: PartialSubscribeRequest) => {
   // Make sure to query our local relay too
   const delay = ctx.app.requestDelay
   const timeout = ctx.app.requestTimeout
-  const sub = baseSubscribe({delay, authTimeout: timeout, relays: [], ...request})
+  const authTimeout = ctx.app.authTimeout
+  const sub = baseSubscribe({delay, timeout, authTimeout, relays: [], ...request})
 
   sub.emitter.on("event", (url: string, e: TrustedEvent) => {
     repository.publish(e)
diff --git a/packages/util/src/Tags.ts b/packages/util/src/Tags.ts
index 2833cb6..a59d454 100644
--- a/packages/util/src/Tags.ts
+++ b/packages/util/src/Tags.ts
@@ -41,7 +41,7 @@ export class Tags extends (Fluent<Tag> as OmitStatics<typeof Fluent<Tag>, 'from'
 
   static wrap = (p: Iterable<string[]>) => new Tags(Array.from(p).map(Tag.from))
 
-  static fromEvent = (event: {tags: string[][]}) => Tags.wrap(event.tags || [])
+  static fromEvent = (event: {tags: string[][]}) => Tags.wrap(event?.tags || [])
 
   static fromEvents = (events: {tags: string[][]}[]) => Tags.wrap(events.flatMap(e => e.tags || []))