diff --git a/app/models/validations/sales/financial_validations.rb b/app/models/validations/sales/financial_validations.rb
index 44f69535e..afb8593a8 100644
--- a/app/models/validations/sales/financial_validations.rb
+++ b/app/models/validations/sales/financial_validations.rb
@@ -90,14 +90,14 @@ module Validations::Sales::FinancialValidations
 
     ranges = EQUITY_RANGES_BY_YEAR.fetch(record.collection_start_year, DEFAULT_EQUITY_RANGES)
 
-    if (range = ranges[record.type])
-      if record.equity < range.min
-        record.errors.add :type, I18n.t("validations.financial.equity.under_min", min_equity: range.min)
-        record.errors.add :equity, I18n.t("validations.financial.equity.under_min", min_equity: range.min)
-      elsif record.equity > range.max
-        record.errors.add :type, I18n.t("validations.financial.equity.over_max", max_equity: range.max)
-        record.errors.add :equity, I18n.t("validations.financial.equity.over_max", max_equity: range.max)
-      end
+    return unless (range = ranges[record.type])
+
+    if record.equity < range.min
+      record.errors.add :type, I18n.t("validations.financial.equity.under_min", min_equity: range.min)
+      record.errors.add :equity, I18n.t("validations.financial.equity.under_min", min_equity: range.min)
+    elsif record.equity > range.max
+      record.errors.add :type, I18n.t("validations.financial.equity.over_max", max_equity: range.max)
+      record.errors.add :equity, I18n.t("validations.financial.equity.over_max", max_equity: range.max)
     end
   end
 
diff --git a/spec/models/validations/sales/financial_validations_spec.rb b/spec/models/validations/sales/financial_validations_spec.rb
index abda71f7a..350cc66ef 100644
--- a/spec/models/validations/sales/financial_validations_spec.rb
+++ b/spec/models/validations/sales/financial_validations_spec.rb
@@ -270,11 +270,10 @@ RSpec.describe Validations::Sales::FinancialValidations do
   describe "#validate_equity_in_range_for_year_and_type" do
     let(:record) { FactoryBot.create(:sales_log, saledate: now) }
 
-    before do
-      Timecop.freeze(now)
-    end
-
-    after do
+    around do |example|
+      Timecop.freeze(now) do
+        example.run
+      end
       Timecop.unfreeze
     end