diff --git a/bed-presence-mk1/base.yaml b/bed-presence-mk1/base.yaml
index 93f0725..3f2a827 100644
--- a/bed-presence-mk1/base.yaml
+++ b/bed-presence-mk1/base.yaml
@@ -74,3 +74,11 @@ button:
     name: Restart
     id: btn_restart
     entity_category: "diagnostic"
+
+switch:
+  - platform: template
+    name: Expand Range
+    id: expand_range
+    optimistic: true
+    restore_mode: RESTORE_DEFAULT_OFF
+    entity_category: "configuration"
diff --git a/bed-presence-mk1/sensor.yaml b/bed-presence-mk1/sensor.yaml
index 1366eb5..27d995a 100644
--- a/bed-presence-mk1/sensor.yaml
+++ b/bed-presence-mk1/sensor.yaml
@@ -85,7 +85,7 @@ sensor:
           window_size: ${averaging_window_samples}
           send_every: 1
       - lambda: |-                                # clamp to a min_value of 0 unless expand_range is True
-            if (x >= 0 || id(expand_${sensor_id}_range).state) {
+            if (x >= 0 || id(expand_range).state) {
                 return x;
             } else {
                 return 0;
@@ -167,13 +167,6 @@ button:
             # round to 2 decimal places
             value: !lambda return round(id(bed_sensor_${sensor_id}).state * 100)/100.0;
 
-switch:
-  - platform: template
-    name: Expand ${sensor_name} Range
-    id: expand_${sensor_id}_range
-    optimistic: true
-    restore_mode: RESTORE_DEFAULT_OFF
-
 script:
   - id: update_trigger_${sensor_id}
     mode: queued