diff --git a/email/1.3.0/src/app.py b/email/1.3.0/src/app.py
index aabb1bbe..049481f6 100644
--- a/email/1.3.0/src/app.py
+++ b/email/1.3.0/src/app.py
@@ -382,7 +382,11 @@ def merge(d1, d2):
                 output_dict["imap_id"] = id_list[i]
 
                 # Add message-id as top returned field
-                output_dict["message_id"] = parsed_eml["header"]["header"]["message-id"][0]
+                try:
+                    output_dict["message_id"] = parsed_eml["header"]["header"]["message-id"][0]
+                except Exception as _:
+                    output_dict["message_id"] = ""
+
 
                 if upload_email_shuffle:
                     self.logger.info("Uploading email to shuffle")