diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
index 50fb3ef2d..1fd3f28d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
@@ -462,7 +462,7 @@ public final class ConversationListItem extends ConstraintLayout implements Bind
   }
 
   private void setUnreadIndicator(ThreadRecord thread) {
-    if ((thread.isOutgoing() && !thread.isForcedUnread()) || thread.isRead()) {
+    if (thread.isRead()) {
       unreadIndicator.setVisibility(View.GONE);
       return;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
index e00744075..8a3d7a251 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
@@ -156,6 +156,10 @@ public final class MultiShareSender {
         results.add(new MultiShareSendResult(recipientSearchKey, MultiShareSendResult.Type.SUCCESS));
       }
 
+      if (!recipientSearchKey.isStory()) {
+        SignalDatabase.threads().setRead(threadId, true);
+      }
+
       // XXX We must do this to avoid sending out messages to the same recipient with the same
       //     sentTimestamp. If we do this, they'll be considered dupes by the receiver.
       ThreadUtil.sleep(5);