diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index fd8103bcdf..80d87556df 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -141,15 +141,6 @@ Lint/RedundantSafeNavigation:
   Exclude:
     - 'app/models/spree/payment.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: present?, blank?, presence, try, try!, in?
-Lint/SafeNavigationChain:
-  Exclude:
-    - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/stock/availability_validator.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
diff --git a/app/models/spree/line_item.rb b/app/models/spree/line_item.rb
index 0f487a4913..1631832ca5 100644
--- a/app/models/spree/line_item.rb
+++ b/app/models/spree/line_item.rb
@@ -280,7 +280,7 @@ module Spree
       if final_weight_volume.present? && quantity_was > 0
         self.final_weight_volume = final_weight_volume * quantity / quantity_was
       elsif variant&.unit_value.present?
-        self.final_weight_volume = variant&.unit_value * quantity
+        self.final_weight_volume = variant&.unit_value&.* quantity
       end
     end
   end
diff --git a/app/models/spree/stock/availability_validator.rb b/app/models/spree/stock/availability_validator.rb
index fc94efd1c6..513b9fbc61 100644
--- a/app/models/spree/stock/availability_validator.rb
+++ b/app/models/spree/stock/availability_validator.rb
@@ -28,7 +28,7 @@ module Spree
 
       def line_item_shipment(line_item)
         return line_item.target_shipment if line_item.target_shipment
-        return line_item.order.shipments.first if line_item.order&.shipments.any?
+        return line_item.order.shipments.first if line_item.order&.shipments&.any?
       end
 
       # Overrides Spree v2.0.4 validate method version to: