diff --git a/packages/pl-fe/src/actions/export-data.ts b/packages/pl-fe/src/actions/export-data.ts
index 09136b75e..05ed669a0 100644
--- a/packages/pl-fe/src/actions/export-data.ts
+++ b/packages/pl-fe/src/actions/export-data.ts
@@ -51,25 +51,23 @@ const exportFollows = () => async (_dispatch: AppDispatch, getState: () => RootS
     });
 };
 
-const exportBlocks = () => (_dispatch: AppDispatch, getState: () => RootState) => {
-  return getClient(getState()).filtering.getBlocks({ limit: 40 })
+const exportBlocks = () => (_dispatch: AppDispatch, getState: () => RootState) =>
+  getClient(getState()).filtering.getBlocks({ limit: 40 })
     .then(listAccounts)
     .then((blocks) => {
       fileExport(blocks.join('\n'), 'export_block.csv');
 
       toast.success(messages.blocksSuccess);
     });
-};
 
-const exportMutes = () => (_dispatch: AppDispatch, getState: () => RootState) => {
-  return getClient(getState()).filtering.getMutes({ limit: 40 })
+const exportMutes = () => (_dispatch: AppDispatch, getState: () => RootState) =>
+  getClient(getState()).filtering.getMutes({ limit: 40 })
     .then(listAccounts)
     .then((mutes) => {
       fileExport(mutes.join('\n'), 'export_mutes.csv');
 
       toast.success(messages.mutesSuccess);
     });
-};
 
 export {
   exportFollows,
diff --git a/packages/pl-fe/src/features/status/components/thread.tsx b/packages/pl-fe/src/features/status/components/thread.tsx
index 0bd25a125..4f8bbda1b 100644
--- a/packages/pl-fe/src/features/status/components/thread.tsx
+++ b/packages/pl-fe/src/features/status/components/thread.tsx
@@ -328,31 +328,35 @@ const Thread: React.FC<IThread> = ({
 
   const focusedStatus = (
     <div className={clsx({ 'pb-4': hasDescendants })} key={status.id}>
-      <HotKeys handlers={handlers}>
-        <div
-          ref={statusRef}
-          className='focusable relative'
-          tabIndex={0}
-          // FIXME: no "reblogged by" text is added for the screen reader
-          aria-label={textForScreenReader(intl, status)}
-        >
+      {status.deleted ? (
+        <Tombstone id={status.id} onMoveUp={handleMoveUp} onMoveDown={handleMoveDown} />
+      ) : (
+        <HotKeys handlers={handlers}>
+          <div
+            ref={statusRef}
+            className='focusable relative'
+            tabIndex={0}
+            // FIXME: no "reblogged by" text is added for the screen reader
+            aria-label={textForScreenReader(intl, status)}
+          >
 
-          <DetailedStatus
-            status={status}
-            withMedia={withMedia}
-            onOpenCompareHistoryModal={handleOpenCompareHistoryModal}
-          />
+            <DetailedStatus
+              status={status}
+              withMedia={withMedia}
+              onOpenCompareHistoryModal={handleOpenCompareHistoryModal}
+            />
 
-          <hr className='-mx-4 mb-2 max-w-[100vw] border-t-2 black:border-t dark:border-gray-800' />
+            <hr className='-mx-4 mb-2 max-w-[100vw] border-t-2 black:border-t dark:border-gray-800' />
 
-          <StatusActionBar
-            status={status}
-            expandable={isModal}
-            space='lg'
-            withLabels
-          />
-        </div>
-      </HotKeys>
+            <StatusActionBar
+              status={status}
+              expandable={isModal}
+              space='lg'
+              withLabels
+            />
+          </div>
+        </HotKeys>
+      )}
 
       {hasDescendants && (
         <hr className='-mx-4 mt-2 max-w-[100vw] border-t-2 black:border-t dark:border-gray-800' />
diff --git a/packages/pl-fe/src/queries/chats.ts b/packages/pl-fe/src/queries/chats.ts
index d4f6789fb..8c41995b9 100644
--- a/packages/pl-fe/src/queries/chats.ts
+++ b/packages/pl-fe/src/queries/chats.ts
@@ -153,9 +153,8 @@ const useChatActions = (chatId: string) => {
       .catch(() => null);
 
   const createChatMessage = useMutation({
-    mutationFn: ({ chatId, content, mediaId }: { chatId: string; content: string; mediaId?: string }) => {
-      return client.chats.createChatMessage(chatId, { content, media_id: mediaId });
-    },
+    mutationFn: ({ chatId, content, mediaId }: { chatId: string; content: string; mediaId?: string }) =>
+      client.chats.createChatMessage(chatId, { content, media_id: mediaId }),
     retry: false,
     onMutate: async (variables) => {
       // Cancel any outgoing refetches (so they don't overwrite our optimistic update)
diff --git a/packages/pl-fe/src/queries/relationships.ts b/packages/pl-fe/src/queries/relationships.ts
index 718856c1e..6185a0750 100644
--- a/packages/pl-fe/src/queries/relationships.ts
+++ b/packages/pl-fe/src/queries/relationships.ts
@@ -6,9 +6,8 @@ const useFetchRelationships = () => {
   const client = useClient();
 
   return useMutation({
-    mutationFn: ({ accountIds }: { accountIds: string[]}) => {
-      return client.accounts.getRelationships(accountIds);
-    },
+    mutationFn: ({ accountIds }: { accountIds: string[]}) =>
+      client.accounts.getRelationships(accountIds),
   });
 };