diff --git a/js/modules/types/attachment.js b/js/modules/types/attachment.js
index 1e09ad338..6c0f43343 100644
--- a/js/modules/types/attachment.js
+++ b/js/modules/types/attachment.js
@@ -27,7 +27,7 @@ exports.CURRENT_SCHEMA_VERSION = 2;
 //   contentType: MIMEType
 //   data: ArrayBuffer
 //   digest: ArrayBuffer
-//   fileName: string
+//   fileName: string | null
 //   flags: null
 //   key: ArrayBuffer
 //   size: integer
@@ -53,8 +53,10 @@ exports.isValid = (rawAttachment) => {
     return false;
   }
 
-  return isString(rawAttachment.contentType) &&
-    isString(rawAttachment.fileName);
+  const hasValidContentType = isString(rawAttachment.contentType);
+  const hasValidFileName =
+    isString(rawAttachment.fileName) || rawAttachment.fileName === null;
+  return hasValidContentType && hasValidFileName;
 };
 
 // Middleware