diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index e10d0add..99cca19e 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -750,6 +750,7 @@ $(function() {
         {% if mode in ['onestep'] %}
             // get nearest hubs ajax
             var hub_table = '';
+            var rider_table = '';
             $.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) {
                 var hubs = data['hubs'];
                 for (i in hubs) {
@@ -768,11 +769,23 @@ $(function() {
                 $('#nearest_hubs').html(hub_table);
             
             });
+
+            // clear rider table
+            rider_table += '<tr>';
+            rider_table += '<td>' + '</td>';
+            rider_table += '<td>' + '</td>';
+            rider_table += '<td>' + '</td>';
+            rider_table += '<td>' + '</td>';
+            rider_table += '</tr>';
+
+            $('#riders').html(rider_table);
+
         {% endif %}
 
         {% if mode in ['onestep-edit'] %}
             // get nearest hubs ajax
             var hub_table = '';
+            var rider_table = '';
             $.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) {
                 var hubs = data['hubs'];
                 for (i in hubs) {
@@ -794,8 +807,22 @@ $(function() {
 
                 }
 
-                $('#nearest_hubs').html(hub_table);
+            $('#nearest_hubs').html(hub_table);
+
             });
+
+            if (selected_rider == '') {
+                // clear rider table
+                rider_table += '<tr>';
+                rider_table += '<td>' + '</td>';
+                rider_table += '<td>' + '</td>';
+                rider_table += '<td>' + '</td>';
+                rider_table += '<td>' + '</td>';
+                rider_table += '</tr>';
+
+                $('#riders').html(rider_table);
+            }
+
         {% endif %}
 
         {% if mode in ['view-all', 'update-fulfillment'] %}
@@ -849,6 +876,9 @@ $(function() {
     });
 
     osm_map.on('click', function(e) {
+        // clear selected hub and riders
+        selected_hub = '';
+        selected_rider = '';
         selectPoint(e.latlng.lat, e.latlng.lng);
     });