diff --git a/app/models/certificate.rb b/app/models/certificate.rb
index 940c5fdc8..d2428365a 100644
--- a/app/models/certificate.rb
+++ b/app/models/certificate.rb
@@ -32,7 +32,7 @@ class Certificate < ApplicationRecord
       errors.add(:base, I18n.t(:invalid_csr_or_crt))
   end
 
-  validate :assign_metadata
+  validate :assign_metadata, on: :create
 
   def assign_metadata
     origin = crt ? parsed_crt : parsed_csr