diff --git a/client/src/components/Settings/Encryption/index.js b/client/src/components/Settings/Encryption/index.js
index 09efec6f..b84ee889 100644
--- a/client/src/components/Settings/Encryption/index.js
+++ b/client/src/components/Settings/Encryption/index.js
@@ -9,7 +9,9 @@ import Card from '../../ui/Card';
 
 class Encryption extends Component {
     componentDidMount() {
-        this.props.validateTlsConfig(this.props.encryption);
+        if (this.props.encryption.enabled) {
+            this.props.validateTlsConfig(this.props.encryption);
+        }
     }
 
     handleFormSubmit = (values) => {