diff --git a/Signal/src/ViewControllers/HomeView/ThreadSwipeHandler.swift b/Signal/src/ViewControllers/HomeView/ThreadSwipeHandler.swift
index 5f91c79a83..6e87880733 100644
--- a/Signal/src/ViewControllers/HomeView/ThreadSwipeHandler.swift
+++ b/Signal/src/ViewControllers/HomeView/ThreadSwipeHandler.swift
@@ -33,6 +33,9 @@ extension ThreadSwipeHandler where Self: UIViewController {
             pinnedStateAction.image = actionImage(name: "unpin-solid-24", title: CommonStrings.unpinAction)
         } else {
             pinnedStateAction = UIContextualAction(style: .destructive, title: nil) { [weak self] (_, _, completion) in
+                if threadViewModel.isArchived {
+                    self?.archiveThread(threadViewModel: threadViewModel, closeConversationBlock: nil)
+                }
                 completion(false)
                 self?.pinThread(threadViewModel: threadViewModel)
             }