diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index c5d4d86ac..1e2301855 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -569,6 +569,10 @@ timestamp, contact):
 			# so we cannot send chatstate anymore
 			return
 
+		# Don't send chatstates to offline contacts
+		if contact.show == 'offline':
+			return
+
 		if contact.chatstate is False: # jid cannot do jep85
 			return