diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a08dcd1c0..044f54a81f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Incorrect translation displaying in Home Page Carousel for da, sv and no. [#2224]https://github.com/bigcommerce/cornerstone/pull/2224
 - Blog Pages Do Not Include Link Rel Next/Prev Tags. [#2214](https://github.com/bigcommerce/cornerstone/issues/2214).
 - Add lang attribute to html tag to improve checkout accesibility [#2210]https://github.com/bigcommerce/cornerstone/pull/2210
+- "None" modifier option is displayed as selected even if there is default modifier option [#2227]https://github.com/bigcommerce/cornerstone/pull/2227
 - Add pickups to storefront invoice [#2216](https://github.com/bigcommerce/cornerstone/pull/2216)
 
 ## Unreleased (unreleased)
diff --git a/templates/components/products/options/set-rectangle.html b/templates/components/products/options/set-rectangle.html
index af1545f351..aee28b250a 100644
--- a/templates/components/products/options/set-rectangle.html
+++ b/templates/components/products/options/set-rectangle.html
@@ -10,12 +10,12 @@
         <input
             class="form-radio"
             type="radio"
-            id="attribute_rectangle__{{../id}}_none"
-            name="attribute[{{../id}}]"
+            id="attribute_rectangle__{{id}}_none"
+            name="attribute[{{id}}]"
             value=""
             checked="{{#if defaultValue '==' ''}}checked{{/if}}"
         >
-        <label class="form-option" for="attribute_rectangle__{{../id}}_none">
+        <label class="form-option" for="attribute_rectangle__{{id}}_none">
             <span class="form-option-variant">{{lang 'products.none'}}</span>
         </label>
     {{/unless}}