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 29df8fd94..aa264af5f 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
@@ -185,14 +185,14 @@ private final class LinearWaypointEditor extends WaypointEditor {
         private LinearWaypointEditor(Player player) {
             this.player = player;
             this.markers = new EntityMarkers<Waypoint>();
-            if (showingMarkers) {
-                createWaypointMarkers();
-            }
         }
 
         @Override
         public void begin() {
             Messaging.sendTr(player, Messages.LINEAR_WAYPOINT_EDITOR_BEGIN);
+            if (showingMarkers) {
+                createWaypointMarkers();
+            }
         }
 
         private void clearWaypoints() {
@@ -212,13 +212,11 @@ private void createWaypointMarkers() {
         public void end() {
             if (!editing)
                 return;
+            editing = false;
             if (conversation != null) {
                 conversation.abandon();
             }
             Messaging.sendTr(player, Messages.LINEAR_WAYPOINT_EDITOR_END);
-            editing = false;
-            if (!showingMarkers)
-                return;
             markers.destroyMarkers();
         }