diff --git a/src/state/queries/postgate/util.ts b/src/state/queries/postgate/util.ts
index 1492e2df31..a60d5c5f95 100644
--- a/src/state/queries/postgate/util.ts
+++ b/src/state/queries/postgate/util.ts
@@ -58,13 +58,13 @@ export function createEmbed({
   detached: boolean
 }) {
   if (AppBskyEmbedRecord.isView(post.embed)) {
-    if (detached) return createEmbedViewRemovedRecord({uri: post.uri})
+    if (detached) return createEmbedViewRemovedRecord({uri: embeddedPost.uri})
     return createEmbedRecordView({post: embeddedPost})
   } else if (AppBskyEmbedRecordWithMedia.isView(post.embed)) {
     if (detached)
       return {
         ...post.embed,
-        record: createEmbedViewRemovedRecord({uri: post.uri}),
+        record: createEmbedViewRemovedRecord({uri: embeddedPost.uri}),
       }
     return createEmbedRecordWithmediaView({post, embeddedPost})
   }
diff --git a/src/view/com/util/forms/PostDropdownBtn.tsx b/src/view/com/util/forms/PostDropdownBtn.tsx
index c33e79d951..bbba1a66aa 100644
--- a/src/view/com/util/forms/PostDropdownBtn.tsx
+++ b/src/view/com/util/forms/PostDropdownBtn.tsx
@@ -153,6 +153,7 @@ let PostDropdownBtn = ({
   }, [post, currentAccount])
 
   const rootUri = record.reply?.root?.uri || postUri
+  const isReply = Boolean(record.reply)
   const [isThreadMuted, muteThread, unmuteThread] = useThreadMuteMutationQueue(
     post,
     rootUri,
@@ -468,7 +469,7 @@ let PostDropdownBtn = ({
                   </Menu.Item>
                 )}
 
-                {!isAuthor && !isPostHidden && rootPostUri && (
+                {!isAuthor && !isPostHidden && rootPostUri && isReply && (
                   <Menu.Item
                     testID="postDropdownHideBtn"
                     label={
@@ -489,10 +490,21 @@ let PostDropdownBtn = ({
                 {quoteEmbed && quoteEmbed.isOwnedByViewer && (
                   <Menu.Item
                     testID="postDropdownHideBtn"
-                    label={_(msg`Detach quote`)}
+                    label={
+                      quoteEmbed.isDetached
+                        ? _(msg`Re-attach quote`)
+                        : _(msg`Detach quote`)
+                    }
                     onPress={onToggleQuotePostAttachment}>
-                    <Menu.ItemText>{_(msg`Detach quote`)}</Menu.ItemText>
-                    <Menu.ItemIcon icon={EyeSlash} position="right" />
+                    <Menu.ItemText>
+                      {quoteEmbed.isDetached
+                        ? _(msg`Re-attach quote`)
+                        : _(msg`Detach quote`)}
+                    </Menu.ItemText>
+                    <Menu.ItemIcon
+                      icon={quoteEmbed.isDetached ? EyeSlash : EyeSlash}
+                      position="right"
+                    />
                   </Menu.Item>
                 )}
               </Menu.Group>
diff --git a/src/view/com/util/post-embeds/QuoteEmbed.tsx b/src/view/com/util/post-embeds/QuoteEmbed.tsx
index 20c05b692b..dc5e771606 100644
--- a/src/view/com/util/post-embeds/QuoteEmbed.tsx
+++ b/src/view/com/util/post-embeds/QuoteEmbed.tsx
@@ -84,6 +84,15 @@ export function MaybeQuoteEmbed({
         </Text>
       </View>
     )
+  } else if (AppBskyEmbedRecord.isViewRemoved(embed.record)) {
+    return (
+      <View style={[styles.errorContainer, pal.borderDark]}>
+        <InfoCircleIcon size={18} style={pal.text} />
+        <Text type="lg" style={pal.text}>
+          <Trans>Removed by author</Trans>
+        </Text>
+      </View>
+    )
   }
   return null
 }