diff --git a/waypoint_nav/scripts/tandem_run_manager.py b/waypoint_nav/scripts/tandem_run_manager.py
index c402e00..b1c39f9 100755
--- a/waypoint_nav/scripts/tandem_run_manager.py
+++ b/waypoint_nav/scripts/tandem_run_manager.py
@@ -26,6 +26,7 @@
                 self.tandem_start_list.append(i+2)
             if ("tandem_end" in data["point"]):
                 self.tandem_end_list.append(i+2)
+        self.no_tandem_area = (len(self.tandem_start_list) == 0)
         ## Subscribers
         self.wp_num_sub = rospy.Subscriber("/waypoint_num", UInt16, self.waypoint_num_callback)
         self.scan_sub = rospy.Subscriber("/scan", LaserScan, self.laserscan_callback)
@@ -47,7 +48,7 @@
 
     ## Subscribe current waypoint number
     def waypoint_num_callback(self, msg):
-        if (msg.data == self.waypoint_num) or (self.stop): return
+        if (self.no_tandem_area) or (msg.data == self.waypoint_num) or (self.stop): return
         if (msg.data == self.tandem_start_list[self.tandem_id]):
             self.in_tandem_area = True
             self.costmap_client1.update_configuration({"enabled": False})