diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
index c5f815a1ea..c2922fbfc0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
@@ -80,7 +80,7 @@ public class TypingStatusSender {
     ThreadDatabase threadDatabase = DatabaseComponent.get(context).threadDatabase();
     Recipient recipient = threadDatabase.getRecipientForThreadId(threadId);
     if (recipient == null) { return; }
-    if (!SessionMetaProtocol.shouldSendTypingIndicator(recipient.getAddress())) { return; }
+    if (!SessionMetaProtocol.shouldSendTypingIndicator(recipient)) { return; }
     TypingIndicator typingIndicator;
     if (typingStarted) {
       typingIndicator = new TypingIndicator(TypingIndicator.Kind.STARTED);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt
index 9d81ed56ee..05b6fe86f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt
@@ -53,7 +53,7 @@ object SessionMetaProtocol {
     }
 
     @JvmStatic
-    fun shouldSendTypingIndicator(address: Address): Boolean {
-        return !address.isGroup
+    fun shouldSendTypingIndicator(recipient: Recipient): Boolean {
+        return !recipient.isGroupRecipient && recipient.isApproved
     }
 }
\ No newline at end of file