diff --git a/src/lib/routes/helpers.ts b/src/lib/routes/helpers.ts
index 7097f09bd0..0da8850433 100644
--- a/src/lib/routes/helpers.ts
+++ b/src/lib/routes/helpers.ts
@@ -1,7 +1,7 @@
 import {NavigationProp} from '@react-navigation/native'
 import {State, RouteParams} from './types'
 
-export function getRootNavigation<T>(
+export function getRootNavigation<T extends {}>(
   nav: NavigationProp<T>,
 ): NavigationProp<T> {
   while (nav.getParent()) {
diff --git a/src/state/queries/notifications/feed.ts b/src/state/queries/notifications/feed.ts
index 4d4c850ca5..d2c150c31a 100644
--- a/src/state/queries/notifications/feed.ts
+++ b/src/state/queries/notifications/feed.ts
@@ -120,7 +120,7 @@ export function* findAllPostsInQueryData(
         if (item.subject?.uri === uri) {
           yield item.subject
         }
-        const quotedPost = getEmbeddedPost(item.subject.embed)
+        const quotedPost = getEmbeddedPost(item.subject?.embed)
         if (quotedPost?.uri === uri) {
           yield embedViewRecordToPostView(quotedPost)
         }
diff --git a/src/state/queries/post-thread.ts b/src/state/queries/post-thread.ts
index cedbbc9ddc..6e9cb28dd9 100644
--- a/src/state/queries/post-thread.ts
+++ b/src/state/queries/post-thread.ts
@@ -239,7 +239,8 @@ export function* findAllPostsInQueryData(
       if (item.uri === uri) {
         yield item
       }
-      const quotedPost = getEmbeddedPost(item.post.embed)
+      const quotedPost =
+        item.type === 'post' ? getEmbeddedPost(item.post.embed) : undefined
       if (quotedPost?.uri === uri) {
         yield embedViewRecordToPlaceholderThread(quotedPost)
       }