diff --git a/js/models/conversations.js b/js/models/conversations.js
index 589a5a371..891a345d5 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -208,8 +208,8 @@
     },
 
     bumpTyping() {
-      // We don't send typing messages if the setting is disabled
-      if (!storage.get('typing-indicators-setting')) {
+      // We don't send typing messages if the setting is disabled or we aren't friends
+      if (!this.isFriend() || !storage.get('typing-indicators-setting')) {
         return;
       }