diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
index aeaa52edd..be87ce9b4 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
@@ -324,10 +324,10 @@ public void onPlayerInteract(PlayerInteractEvent event) {
 
                 Waypoint element = new Waypoint(at);
                 normaliseEditingSlot();
-                if (editingSlot == waypoints.size()) {
+                if (editingSlot + 1 >= waypoints.size()) {
                     waypoints.add(element);
                 } else {
-                    waypoints.add(editingSlot, element);
+                    waypoints.add(editingSlot + 1, element);
                 }
                 if (showPath) {
                     markers.createMarker(element, element.getLocation().clone().add(0, 1, 0));