diff --git a/src/chat_control.py b/src/chat_control.py
index e5267bd262b2a5cce55be5e6817762622d7030e9..b7a919f315a2184da2b1e7b67e37904ff8d4e6cd 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -988,7 +988,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
             return
         if kind in ('incoming', 'outgoing'):
             self.last_received_txt[name] = text
-            self.last_received_id[name] = correct_id[0]
+            if correct_id:
+                self.last_received_id[name] = correct_id[0]
         if kind == 'incoming':
             if not self.type_id == message_control.TYPE_GC or \
             gajim.config.get('notify_on_all_muc_messages') or \