diff --git a/src/compatibility.js b/src/compatibility.js
index 88c3d07..5217038 100644
--- a/src/compatibility.js
+++ b/src/compatibility.js
@@ -16,7 +16,10 @@ export function highlightMeasurementTerrainRuler(ray, startDistance, tokenShape=
 
 export function measureDistances(segments, entity, shape, options={}) {
 	const opts = duplicate(options)
-
+	if (canvas.grid.diagonalRule === "EUCL") {
+		opts.ignoreGrid = true;
+		opts.gridSpaes = false;
+	}
 	if (opts.enableTerrainRuler) {
 		opts.gridSpaces = true;
 		const firstNewSegmentIndex = segments.findIndex(segment => !segment.ray.dragRulerVisitedSpaces);
diff --git a/src/foundry_imports.js b/src/foundry_imports.js
index 23dac21..8ed44cf 100644
--- a/src/foundry_imports.js
+++ b/src/foundry_imports.js
@@ -165,6 +165,11 @@ export function measure(destination, options={}) {
 		options.gridSpaces = canvas.grid.type !== CONST.GRID_TYPES.GRIDLESS;
 	}
 
+	if (canvas.grid.diagonalRule === "EUCL") {
+		options.gridSpaces = false;
+		options.ignoreGrid = true;
+	}
+
 	if(options.ignoreGrid === undefined) {
 		options.ignoreGrid = false;
 	}