diff --git a/src/ruler.js b/src/ruler.js
index cc3c7f4..92f6475 100644
--- a/src/ruler.js
+++ b/src/ruler.js
@@ -35,8 +35,13 @@ export class DragRulerRuler extends Ruler {
 		const json = super.toJSON();
 		if (this.draggedEntity) {
 			const isToken = this.draggedEntity instanceof Token;
-			json["draggedEntityIsToken"] = isToken;
-			json["draggedEntity"] = this.draggedEntity.id;
+			json.draggedEntityIsToken = isToken;
+			json.draggedEntity = this.draggedEntity.id;
+			json.waypoints = json.waypoints.map(old => {
+				let w = duplicate(old);
+				w.isPathfinding = undefined;
+				return w;
+			});
 		}
 		return json;
 	}