diff --git a/web/react/components/post_attachment.jsx b/web/react/components/post_attachment.jsx
index 2d6b47f03d..cf65dfbfb2 100644
--- a/web/react/components/post_attachment.jsx
+++ b/web/react/components/post_attachment.jsx
@@ -50,7 +50,8 @@ export default class PostAttachment extends React.Component {
     }
 
     shouldCollapse() {
-        return (this.props.attachment.text.match(/\n/g) || []).length >= 5 || this.props.attachment.text.length > 700;
+        const text = this.props.attachment.text || '';
+        return (text.match(/\n/g) || []).length >= 5 || text.length > 700;
     }
 
     getCollapsedText() {
@@ -292,4 +293,4 @@ export default class PostAttachment extends React.Component {
 
 PostAttachment.propTypes = {
     attachment: React.PropTypes.object.isRequired
-};
\ No newline at end of file
+};