diff --git a/ts/state/selectors/search.ts b/ts/state/selectors/search.ts
index 0580c412e2..0c0ff4d02b 100644
--- a/ts/state/selectors/search.ts
+++ b/ts/state/selectors/search.ts
@@ -200,6 +200,9 @@ export const getMessageSearchResultSelector = createSelector(
       if (type === 'incoming') {
         from = conversationSelector(sourceUuid || source);
         to = conversationSelector(conversationId);
+        if (from === to) {
+          to = conversationSelector(ourConversationId);
+        }
       } else if (type === 'outgoing') {
         from = conversationSelector(ourConversationId);
         to = conversationSelector(conversationId);