diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index ea5f5baa1558..642004913303 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -250,7 +250,7 @@ class AttachmentModal extends PureComponent {
     }
 
     render() {
-        const source = this.state.source;
+        const source = this.props.source || this.state.source;
         return (
             <>
                 <Modal
@@ -274,7 +274,7 @@ class AttachmentModal extends PureComponent {
                         title={this.props.headerTitle || this.props.translate('common.attachment')}
                         shouldShowBorderBottom
                         shouldShowDownloadButton={this.props.allowDownload}
-                        onDownloadButtonPress={() => this.downloadAttachment(source)}
+                        onDownloadButtonPress={() => this.downloadAttachment(this.state.source)}
                         onCloseButtonPress={() => this.setState({isModalOpen: false})}
                     />
                     <View style={styles.imageModalImageCenterContainer}>
@@ -286,7 +286,7 @@ class AttachmentModal extends PureComponent {
                                 onToggleKeyboard={this.updateConfirmButtonVisibility}
                             />
                         ) : (
-                            Boolean(this.state.source) &&
+                            Boolean(source) &&
                             this.state.shouldLoadAttachment && (
                                 <AttachmentView
                                     containerStyles={[styles.mh5]}