diff --git a/src/api.js b/src/api.js
index 6295122..0672964 100644
--- a/src/api.js
+++ b/src/api.js
@@ -121,7 +121,7 @@ export function getColorForDistanceAndToken(distance, token, ranges=null) {
 		ranges = getRangesFromSpeedProvider(token);
 	}
 	if (ranges.length === 0)
-		return this.color;
+		return null;
 	const currentRange = ranges.reduce((minRange, currentRange) => {
 		if (distance <= currentRange.range && currentRange.range < minRange.range)
 			return currentRange;
diff --git a/src/ruler.js b/src/ruler.js
index 6147d08..cd33994 100644
--- a/src/ruler.js
+++ b/src/ruler.js
@@ -169,6 +169,6 @@ export class DragRulerRuler extends Ruler {
 		distance = Math.round(distance * 100) / 100;
 		if (!this.dragRulerRanges)
 			this.dragRulerRanges = getRangesFromSpeedProvider(this.draggedEntity);
-		return getColorForDistanceAndToken(distance, this.draggedEntity, this.dragRulerRanges);
+		return getColorForDistanceAndToken(distance, this.draggedEntity, this.dragRulerRanges) ?? this.color;
 	}
 }