diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
index a541ae727b..c9e651a51d 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
@@ -314,6 +314,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
           handleProfileKey(content, message);
         }
 
+        // Loki - This doesn't get invoked for group chats
         if (content.isNeedsReceipt()) {
           handleNeedsDeliveryReceipt(content, message);
         }
diff --git a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java b/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
index a803671e58..d1dc6e53fb 100644
--- a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
@@ -96,8 +96,11 @@ public class TypingSendJob extends BaseJob implements InjectableType {
     List<Optional<UnidentifiedAccessPair>> unidentifiedAccess = Stream.of(recipients).map(r -> UnidentifiedAccessUtil.getAccessFor(context, r)).toList();
     SignalServiceTypingMessage             typingMessage      = new SignalServiceTypingMessage(typing ? Action.STARTED : Action.STOPPED, System.currentTimeMillis(), groupId);
 
-    // TODO: Message ID
-    messageSender.sendTyping(0, addresses, unidentifiedAccess, typingMessage);
+    // Loki - Don't send typing indicators in group chats
+    if (!recipient.isGroupRecipient()) {
+      // TODO: Message ID
+      messageSender.sendTyping(0, addresses, unidentifiedAccess, typingMessage);
+    }
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
index a6d92782ef..e64f395a3c 100644
--- a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
+++ b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
@@ -86,6 +86,7 @@ public class MarkReadReceiver extends BroadcastReceiver {
                                                          .collect(Collectors.groupingBy(SyncMessageId::getAddress));
 
     for (Address address : addressMap.keySet()) {
+      // Loki - This also prevents read receipts from being sent in group chats as they don't maintain a friend request status
       LokiThreadDatabase lokiThreadDatabase = DatabaseFactory.getLokiThreadDatabase(context);
       long threadID = lokiThreadDatabase.getThreadID(address.serialize());
       LokiThreadFriendRequestStatus friendRequestStatus = lokiThreadDatabase.getFriendRequestStatus(threadID);