diff --git a/sat/core/xmpp.py b/sat/core/xmpp.py
index c8a7fd4a..c8b6b6aa 100644
--- a/sat/core/xmpp.py
+++ b/sat/core/xmpp.py
@@ -970,7 +970,11 @@ class SatMessageProtocol(xmppim.MessageProtocol):
             log.info(u"history is skipped as requested")
             data[u"extra"][u"history"] = C.HISTORY_SKIP
         else:
-            return self.host.memory.addToHistory(self.parent, data)
+            if data[u"message"] or data[u"subject"]:  # we need a message to store
+                return self.host.memory.addToHistory(self.parent, data)
+            else:
+                log.debug(u"not storing empty message to history: {data}"
+                    .format(data=data))
 
     def bridgeSignal(self, __, data):
         try: