diff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rb
index 0e33d6900a1..b9fcaa81b71 100644
--- a/core/app/models/spree/variant.rb
+++ b/core/app/models/spree/variant.rb
@@ -51,6 +51,7 @@ class Variant < Spree::Base
     has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: "Spree::Image"
 
     has_many :prices,
+      -> { with_discarded },
       class_name: 'Spree::Price',
       dependent: :destroy,
       inverse_of: :variant,
diff --git a/core/app/models/spree/variant/price_selector.rb b/core/app/models/spree/variant/price_selector.rb
index 2cc76dad715..cb9566f2e86 100644
--- a/core/app/models/spree/variant/price_selector.rb
+++ b/core/app/models/spree/variant/price_selector.rb
@@ -52,7 +52,9 @@ def price_for_options(price_options)
       #
       # @return [Array<Spree::Price>]
       def sorted_prices_for(variant)
-        variant.prices.sort_by do |price|
+        variant.prices.select do |price|
+          variant.discarded? || price.kept?
+        end.sort_by do |price|
           [
             price.country_iso.nil? ? 0 : 1,
             price.updated_at || Time.zone.now,
diff --git a/core/spec/models/spree/variant_spec.rb b/core/spec/models/spree/variant_spec.rb
index 244b1715f12..40546ea5542 100644
--- a/core/spec/models/spree/variant_spec.rb
+++ b/core/spec/models/spree/variant_spec.rb
@@ -256,6 +256,22 @@
 
       expect(variant.default_price.attributes).to eq(price.attributes)
     end
+
+    context "when the variant and the price are both soft-deleted" do
+      it "will use a deleted price as the default price" do
+        variant = create(:variant, deleted_at: 1.day.ago)
+        variant.prices.each { |price| price.discard }
+        expect(variant.reload.price).to be_present
+      end
+    end
+
+    context "when the variant is not soft-deleted, but its price is" do
+      it "will not use a deleted price as the default price" do
+        variant = create(:variant)
+        variant.prices.each { |price| price.discard }
+        expect(variant.reload.price).not_to be_present
+      end
+    end
   end
 
   describe '#default_price_or_build' do