diff --git a/src/core/sat_main.py b/src/core/sat_main.py
index e0df9a51..b9759404 100644
--- a/src/core/sat_main.py
+++ b/src/core/sat_main.py
@@ -533,7 +533,8 @@ class SAT(service.Service):
             if mess_data["type"] != "groupchat":
                 # we don't add groupchat message to history, as we get them back
                 # and they will be added then
-                self.memory.addToHistory(current_jid, mess_data['to'],
+                if mess_data['message']: # we need a message to save something
+                    self.memory.addToHistory(current_jid, mess_data['to'],
                                          unicode(mess_data["message"]),
                                          unicode(mess_data["type"]),
                                          mess_data['extra'],