diff --git a/app/webpacker/controllers/select_customer_controller.js b/app/webpacker/controllers/select_customer_controller.js
index 7379ac3862..36f8002c50 100644
--- a/app/webpacker/controllers/select_customer_controller.js
+++ b/app/webpacker/controllers/select_customer_controller.js
@@ -39,6 +39,9 @@ export default class extends TomSelectController {
   }
 
   renderOption(item, escape) {
+    if (!item.bill_address) {
+      return this.renderWithNoBillAddress(item, escape);
+    }
     return `<div class='customer-autocomplete-item'>
               <div class='customer-details'>
                 <h5>${escape(item.email)}</h5>
@@ -73,6 +76,12 @@ export default class extends TomSelectController {
             </div>`;
   }
 
+  renderWithNoBillAddress(item, escape) {
+    return `<div class='customer-autocomplete-item'>
+              <div class='customer-details'><h5>${escape(item.email)}</h5></div>
+            </div>`;
+  }
+
   onItemSelect(id, item) {
     const customer = this.items.find((item) => item.id == id);
     ["bill_address", "ship_address"].forEach((address) => {