diff --git a/register/templates/register/react_register.html b/register/templates/register/react_register.html
index 7274a23..1149bf7 100644
--- a/register/templates/register/react_register.html
+++ b/register/templates/register/react_register.html
@@ -553,7 +553,7 @@ <h3> to </h3>
                                         <div className="col-6">
                                           <h5 className="mb-4">Morning Register</h5>
                                           {this.state.data.m_register.map((entry, index) => {
-                                            return entry.status && (
+                                            return entry.status && entry.m_quantity && (
                                               <label key={index}
                                                      className="container-register autopilot-modal-content-mobile">{entry.name} | {entry.m_quantity} ML
                                                 <input name={`${entry.id}-morning`}
@@ -585,7 +585,7 @@ <h5 className="mb-4 text-success">Add Customer to
                                         <div className="col-6">
                                           <h5 className="mb-4">Evening Register</h5>
                                           {this.state.data.e_register.map((entry, index) => {
-                                            return entry.status && (
+                                            return entry.status && entry.e_quantity && (
                                               <label key={index}
                                                      className="container-register autopilot-modal-content-mobile">{entry.name} | {entry.e_quantity} ML
                                                 <input name={`${entry.id}-evening`}
diff --git a/register/views.py b/register/views.py
index 11a7ba2..9c2a37a 100644
--- a/register/views.py
+++ b/register/views.py
@@ -475,15 +475,14 @@ def autopilot(request, year=None, month=None):
                              e.log_date == current_date and e.schedule.startswith(
                         cust['schedule']))
                 except StopIteration:
-                    register_entries.append(Register(tenant=tenant,
-                                                     customer_id=customer.id,
-                                                     log_date=current_date,
-                                                     schedule=f'{cust["schedule"]}-yes',
-                                                     quantity=getattr(customer,
-                                                                      schedule_to_attr.get(
-                                                                          cust['schedule'],
-                                                                          'm_quantity')),
-                                                     current_price=current_price))
+                    quantity = getattr(customer,schedule_to_attr[cust['schedule']])
+                    if quantity is not None:
+                        register_entries.append(Register(tenant=tenant,
+                                                         customer_id=customer.id,
+                                                         log_date=current_date,
+                                                         schedule=f'{cust["schedule"]}-yes',
+                                                         quantity=quantity,
+                                                         current_price=current_price))
 
         Register.objects.bulk_create(register_entries)  # Create bulk Register entry
         response = {