diff --git a/SignalUI/RecipientPickers/ConversationPicker.swift b/SignalUI/RecipientPickers/ConversationPicker.swift
index 78e6d18cb5..a154b4bb69 100644
--- a/SignalUI/RecipientPickers/ConversationPicker.swift
+++ b/SignalUI/RecipientPickers/ConversationPicker.swift
@@ -246,6 +246,15 @@ open class ConversationPickerViewController: OWSTableViewController2 {
         updateTableContents(shouldReload: false)
     }
 
+    open override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+
+        let userInterfaceStyleDidChange = previousTraitCollection?.userInterfaceStyle != traitCollection.userInterfaceStyle
+        if !CurrentAppContext().isMainApp, userInterfaceStyleDidChange {
+            Theme.shareExtensionThemeOverride = traitCollection.userInterfaceStyle
+        }
+    }
+
     // MARK: - ConversationCollection
 
     private func restoreSelection() {