diff --git a/module/canvas/placeables/measuredTemplate.mjs b/module/canvas/placeables/measuredTemplate.mjs
index e1ea79f5..e439dadc 100644
--- a/module/canvas/placeables/measuredTemplate.mjs
+++ b/module/canvas/placeables/measuredTemplate.mjs
@@ -18,7 +18,7 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
 
     static getRangeLabels(distanceValue, settings) {
         let result = { distance: distanceValue, units: '' };
-        if (!settings.enabled) return result;
+        if (!settings.enabled || !canvas.scene) return result;
 
         const sceneRangeMeasurement = canvas.scene.flags.daggerheart?.rangeMeasurement;
         const { disable, custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;
diff --git a/module/enrichers/TemplateEnricher.mjs b/module/enrichers/TemplateEnricher.mjs
index fd0e78eb..1a075518 100644
--- a/module/enrichers/TemplateEnricher.mjs
+++ b/module/enrichers/TemplateEnricher.mjs
@@ -63,14 +63,12 @@ export const renderMeasuredTemplate = async event => {
     const usedAngle =
         type === CONE ? (angle ?? CONFIG.MeasuredTemplate.defaults.angle) : type === INFRONT ? '180' : undefined;
 
-    let baseDistance = range;
-    if (Number.isNaN(Number(range))) {
-        baseDistance = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).rangeMeasurement[
-            range
-        ];
-    }
+    let baseDistance = getTemplateDistance(range);
 
-    const dimensionConstant = game.scenes.active.grid.size / game.scenes.active.grid.distance;
+    const { grid, distance } = CONFIG.Scene.documentClass.schema.fields.grid.fields;
+    const sceneGridSize = canvas.scene?.grid.size ?? grid.size.initial;
+    const sceneGridDistance = canvas.scene?.grid.distance ?? distance.getInitialValue();
+    const dimensionConstant = sceneGridSize / sceneGridDistance;
 
     baseDistance *= dimensionConstant;
 
@@ -115,3 +113,18 @@ export const renderMeasuredTemplate = async event => {
         { create: true }
     );
 };
+
+const getTemplateDistance = range => {
+    const rangeNumber = Number(range);
+    if (!Number.isNaN(rangeNumber)) return rangeNumber;
+
+    const { custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;
+    const sceneMeasurements = canvas.scene?.flags.daggerheart?.rangeMeasurement;
+    const globalMeasurements = game.settings.get(
+        CONFIG.DH.id,
+        CONFIG.DH.SETTINGS.gameSettings.variantRules
+    ).rangeMeasurement;
+
+    const settings = sceneMeasurements?.setting === custom.id ? sceneMeasurements : globalMeasurements;
+    return settings[range];
+};