diff --git a/src/components/main/ForwardPicker.tsx b/src/components/main/ForwardPicker.tsx
index ad68ce17a..c71aefe42 100644
--- a/src/components/main/ForwardPicker.tsx
+++ b/src/components/main/ForwardPicker.tsx
@@ -76,7 +76,7 @@ const ForwardPicker: FC<OwnProps & StateProps> = ({
 
     const chatIds = [
       ...(activeListIds || []),
-      ...(archivedListIds || []),
+      ...((filter && archivedListIds) || []),
     ].filter((id) => {
       const chat = chatsById[id];