diff --git a/src/components/PDFView/PDFPasswordForm.js b/src/components/PDFView/PDFPasswordForm.js
index fbeb84521b60..adbe3e801776 100644
--- a/src/components/PDFView/PDFPasswordForm.js
+++ b/src/components/PDFView/PDFPasswordForm.js
@@ -94,12 +94,16 @@ class PDFPasswordForm extends Component {
     }
 
     validate() {
-        if (!_.isEmpty(this.state.password)) {
+        if (!this.props.isPasswordInvalid && !_.isEmpty(this.state.password)) {
             return true;
         }
-        this.setState({
-            validationErrorText: 'attachmentView.passwordRequired',
-        });
+
+        if (_.isEmpty(this.state.password)) {
+            this.setState({
+                validationErrorText: 'attachmentView.passwordRequired',
+            });
+        }
+
         return false;
     }