diff --git a/client/src/components/Settings/Encryption/Form.js b/client/src/components/Settings/Encryption/Form.js
index 3587d2bd..65867986 100644
--- a/client/src/components/Settings/Encryption/Form.js
+++ b/client/src/components/Settings/Encryption/Form.js
@@ -298,6 +298,7 @@ let Form = (props) => {
                         || submitting
                         || processingConfig
                         || processingValidate
+                        || (isEnabled && (!privateKey || !certificateChain))
                         || (privateKey && !valid_key)
                         || (certificateChain && !valid_cert)
                     }