diff --git a/app/services/permitted_attributes/product.rb b/app/services/permitted_attributes/product.rb
index 716549724d..58600e5f26 100644
--- a/app/services/permitted_attributes/product.rb
+++ b/app/services/permitted_attributes/product.rb
@@ -5,8 +5,6 @@ module PermittedAttributes
     def self.attributes
       [
         :id, :name, :description, :price,
-        :variant_unit, :variant_unit_scale, :variant_unit_with_scale, :unit_value,
-        :unit_description, :variant_unit_name,
         :display_as, :sku, :group_buy, :group_buy_unit_size,
         :taxon_ids, :primary_taxon_id, :tax_category_id, :supplier_id,
         :meta_keywords, :notes, :inherits_properties, :shipping_category_id,
diff --git a/app/services/permitted_attributes/variant.rb b/app/services/permitted_attributes/variant.rb
index 4d4fdcea38..9d20975cb0 100644
--- a/app/services/permitted_attributes/variant.rb
+++ b/app/services/permitted_attributes/variant.rb
@@ -4,11 +4,10 @@ module PermittedAttributes
   class Variant
     def self.attributes
       [
-        :id, :sku, :on_hand, :on_demand, :shipping_category_id,
-        :price, :unit_value, :unit_description,
-        :display_name, :display_as, :tax_category_id,
-        :weight, :height, :width, :depth, :taxon_ids, :primary_taxon_id,
-        :supplier_id
+        :id, :sku, :on_hand, :on_demand, :shipping_category_id, :price, :unit_value,
+        :unit_description, :variant_unit, :variant_unit_name, :variant_unit_scale, :display_name,
+        :display_as, :tax_category_id, :weight, :height, :width, :depth, :taxon_ids,
+        :primary_taxon_id, :supplier_id
       ]
     end
   end
diff --git a/spec/controllers/spree/admin/products_controller_spec.rb b/spec/controllers/spree/admin/products_controller_spec.rb
index f7f81f2cdc..deae56bd80 100644
--- a/spec/controllers/spree/admin/products_controller_spec.rb
+++ b/spec/controllers/spree/admin/products_controller_spec.rb
@@ -111,6 +111,8 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do
                            "on_hand" => 2,
                            "price" => "5.0",
                            "unit_value" => 4,
+                           "variant_unit" => "weight",
+                           "variant_unit_scale" => "1",
                            "unit_description" => "",
                            "display_name" => "name",
                            "primary_taxon_id" => taxon.id,