diff --git a/db/migrate/20220425102039_remove_bill_addresses_with_null_phone.rb b/db/migrate/20220425102039_remove_bill_addresses_with_null_phone.rb
new file mode 100644
index 0000000000..f0d767f95a
--- /dev/null
+++ b/db/migrate/20220425102039_remove_bill_addresses_with_null_phone.rb
@@ -0,0 +1,21 @@
+class RemoveBillAddressesWithNullPhone < ActiveRecord::Migration[6.1]
+  class BillAddress < ActiveRecord::Base
+    self.table_name = "spree_addresses"
+
+    scope :invalid, -> { where(phone: nil) }
+  end
+
+  class SpreeUser < ActiveRecord::Base
+    belongs_to :bill_address
+
+    def self.invalid_bill_address_ids
+      joins(:bill_address).merge(BillAddress.invalid).pluck(:bill_address_id)
+    end
+  end
+
+  def up
+    address_ids = SpreeUser.invalid_bill_address_ids
+    SpreeUser.where(bill_address_id: address_ids).update_all(bill_address_id: nil)
+    BillAddress.where(id: address_ids).delete_all
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 010059c3d6..edfd135051 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1300,7 +1300,7 @@ ActiveRecord::Schema.define(version: 2022_06_02_013938) do
   add_foreign_key "spree_tax_rates", "spree_zones", column: "zone_id", name: "spree_tax_rates_zone_id_fk"
   add_foreign_key "spree_taxons", "spree_taxonomies", column: "taxonomy_id", name: "spree_taxons_taxonomy_id_fk"
   add_foreign_key "spree_taxons", "spree_taxons", column: "parent_id", name: "spree_taxons_parent_id_fk"
-  add_foreign_key "spree_users", "spree_addresses", column: "bill_address_id", name: "spree_users_bill_address_id_fk"
+  add_foreign_key "spree_users", "spree_addresses", column: "bill_address_id", name: "spree_users_bill_address_id_fk", on_delete: :nullify
   add_foreign_key "spree_users", "spree_addresses", column: "ship_address_id", name: "spree_users_ship_address_id_fk"
   add_foreign_key "spree_variants", "spree_products", column: "product_id", name: "spree_variants_product_id_fk"
   add_foreign_key "spree_zone_members", "spree_zones", column: "zone_id", name: "spree_zone_members_zone_id_fk"