diff --git a/app/models/spree/address.rb b/app/models/spree/address.rb
index 9d7cac881f..c9cbeef466 100644
--- a/app/models/spree/address.rb
+++ b/app/models/spree/address.rb
@@ -126,7 +126,7 @@ module Spree
     end
 
     def address_and_city
-      [address1, address2, city].select(&:present?).join(' ')
+      [address1, address2, city].compact_blank.join(' ')
     end
 
     private
@@ -176,7 +176,7 @@ module Spree
     end
 
     def render_address(parts)
-      parts.select(&:present?).join(', ')
+      parts.compact_blank.join(', ')
     end
   end
 end
diff --git a/app/services/address_geocoder.rb b/app/services/address_geocoder.rb
index 789e0695d4..61de7b2547 100644
--- a/app/services/address_geocoder.rb
+++ b/app/services/address_geocoder.rb
@@ -18,7 +18,7 @@ class AddressGeocoder
   attr_reader :address
 
   def geocode_address
-    address_parts.select(&:present?).join(', ')
+    address_parts.compact_blank.join(', ')
   end
 
   def address_parts
diff --git a/spec/lib/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor_report_spec.rb b/spec/lib/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor_report_spec.rb
index ff73f6d12e..8ab11c88c8 100644
--- a/spec/lib/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor_report_spec.rb
+++ b/spec/lib/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor_report_spec.rb
@@ -37,7 +37,7 @@ module Reporting
             order.line_items[0].variant.product.update(name: "Cucumber")
             order.line_items[1].variant.product.update(name: "Apple")
             order.line_items[2].variant.product.update(name: "Banane")
-            product_names = report.rows.map(&:product).filter(&:present?)
+            product_names = report.rows.map(&:product).compact_blank
             expect(product_names).to eq(["Apple", "Banane", "Cucumber"])
           end
         end
@@ -84,7 +84,7 @@ module Reporting
             order.line_items[0].variant.product.update(name: "Cucumber")
             order.line_items[1].variant.product.update(name: "Apple")
             order.line_items[2].variant.product.update(name: "Banane")
-            product_names = report.rows.map(&:product).filter(&:present?)
+            product_names = report.rows.map(&:product).compact_blank
             # only the supplier's variant is displayed
             expect(product_names).to include("Cucumber")
             expect(product_names).not_to include("Apple", "Banane")