diff --git a/app/models/doi.rb b/app/models/doi.rb
index 26a9fb176..9946b8129 100644
--- a/app/models/doi.rb
+++ b/app/models/doi.rb
@@ -154,6 +154,7 @@ def validate_publisher_obj?(doi)
   before_validation :update_identifiers
   before_validation :update_types
   before_save :set_defaults, :save_metadata
+  before_save :update_schema_version
   before_create { self.created = Time.zone.now.utc.iso8601 }
 
   FIELD_OF_SCIENCE_SCHEME = "Fields of Science and Technology (FOS)"
@@ -2332,6 +2333,12 @@ def update_types
     ).compact
   end
 
+  def update_schema_version
+    if current_metadata.present? && current_metadata.valid?
+      self.schema_version = current_metadata.namespace
+    end
+  end
+
   def update_publisher
     case publisher_before_type_cast
     when Hash