diff --git a/tfw/components/frontend/message_queue_handler/message_queue_handler.py b/tfw/components/frontend/message_queue_handler/message_queue_handler.py
index 60b5620..5843a38 100644
--- a/tfw/components/frontend/message_queue_handler/message_queue_handler.py
+++ b/tfw/components/frontend/message_queue_handler/message_queue_handler.py
@@ -17,6 +17,7 @@ class MessageQueueHandler:
         for message in iter(self._queue.get, None):
             wpm = message['wpm'] if 'wpm' in message else self.wpm
             cps = 5 * wpm / 60
+            message['typing'] = not self._queue.empty()
             self.connector.send_message(message)
             sleep(len(message['message']) / cps)
 
@@ -26,11 +27,9 @@ class MessageQueueHandler:
 
     @staticmethod
     def _generate_messages_from_queue(queue_message):
-        last = queue_message['messages'][-1]
         for message in queue_message['messages']:
             yield {
                 'key': 'message.send',
-                'typing': message is not last,
                 **message
             }