diff --git a/app/validators/certificate_key_validator.rb b/app/validators/certificate_key_validator.rb
index 7039bd5a621..098b16017d2 100644
--- a/app/validators/certificate_key_validator.rb
+++ b/app/validators/certificate_key_validator.rb
@@ -16,7 +16,7 @@ class CertificateKeyValidator < ActiveModel::EachValidator
   private
 
   def valid_private_key_pem?(value)
-    return unless value
+    return false unless value
     pkey = OpenSSL::PKey::RSA.new(value)
     pkey.private?
   rescue OpenSSL::PKey::PKeyError
diff --git a/app/validators/certificate_validator.rb b/app/validators/certificate_validator.rb
index 2a04c76d4b9..e3d18097f71 100644
--- a/app/validators/certificate_validator.rb
+++ b/app/validators/certificate_validator.rb
@@ -16,9 +16,9 @@ class CertificateValidator < ActiveModel::EachValidator
   private
 
   def valid_certificate_pem?(value)
-    return unless value
-    OpenSSL::X509::Certificate.new(value)
+    return false unless value
+    OpenSSL::X509::Certificate.new(value).present?
   rescue OpenSSL::X509::CertificateError
-    nil
+    false
   end
 end