diff --git a/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt b/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
index 2276539323..6c2b73ffb1 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
@@ -97,8 +97,8 @@ object SessionMetaProtocol {
      * Should be invoked for the recipient's master device.
      */
     @JvmStatic
-    fun shouldSendTypingIndicator(recipient: Recipient, context: Context): Boolean {
-        if (recipient.isGroupRecipient) { return false }
+    fun shouldSendTypingIndicator(recipient: Recipient?, context: Context): Boolean {
+        if (recipient == null || recipient.isGroupRecipient) { return false }
         val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipient)
         return DatabaseFactory.getLokiThreadDatabase(context).getFriendRequestStatus(threadID) == LokiThreadFriendRequestStatus.FRIENDS
     }