diff --git a/SignalServiceKit/src/Util/TypingIndicators.swift b/SignalServiceKit/src/Util/TypingIndicators.swift
index 97b721391..f148a7555 100644
--- a/SignalServiceKit/src/Util/TypingIndicators.swift
+++ b/SignalServiceKit/src/Util/TypingIndicators.swift
@@ -159,6 +159,10 @@ public class TypingIndicatorsImpl: NSObject, TypingIndicators {
     public func typingRecipientId(forThread thread: TSThread) -> String? {
         AssertIsOnMainThread()
 
+        guard areTypingIndicatorsEnabled() else {
+            return nil
+        }
+
         var firstRecipientId: String?
         var firstTimestamp: UInt64?