diff --git a/CHANGELOG.md b/CHANGELOG.md
index 371ae76..05c51ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## In development
 ### Bugfixes
 - Greatly increased the performance when playing on huge maps and when moving many tokens at once.
+- When starting to drag a new token while the previous one is still moving the ruler won't dissappear anymore when the previous token arrives at it's destination.
 
 
 ## 1.5.4
diff --git a/src/foundry_imports.js b/src/foundry_imports.js
index 0123b84..2067707 100644
--- a/src/foundry_imports.js
+++ b/src/foundry_imports.js
@@ -37,7 +37,8 @@ export async function moveTokens(draggedToken, selectedTokens) {
 	await animateTokens.call(this, selectedTokens, draggedToken, rays, wasPaused);
 
 	// Once all animations are complete we can clear the ruler
-	this._endMeasurement();
+	if (this.draggedToken.id === draggedToken.id)
+		this._endMeasurement();
 }
 
 // This is a modified version code extracted from Ruler.moveToken from foundry 0.7.9