diff --git a/Whatsapp_Chat_Exporter/extract.py b/Whatsapp_Chat_Exporter/extract.py
index 2b5fb90..2fb0e3a 100644
--- a/Whatsapp_Chat_Exporter/extract.py
+++ b/Whatsapp_Chat_Exporter/extract.py
@@ -316,7 +316,7 @@ def messages(db, data, media_folder):
             i += 1
             content = c.fetchone()
             continue
-        if "-" in content["key_remote_jid"] and content["key_from_me"] == 0:
+        if (content["chat_subject"] is not None or "-" in content["key_remote_jid"]) and content["key_from_me"] == 0:
             name = fallback = None
             if table_message:
                 if content["sender_jid_row_id"] > 0: