diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93f6d3a788..e17003e601 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
- Fix an issue with special characters in search results for content pages [#933](https://github.com/bigcommerce/stencil/pull/933)
- Fix an issue with special characters in carousel text [#932](https://github.com/bigcommerce/stencil/pull/932)
- Remove an unnecessary and confusing option in theme editor [#927](https://github.com/bigcommerce/stencil/pull/927)
+- Fix an issue where required product list options would display an invalid "none" choice [#929](https://github.com/bigcommerce/stencil/pull/929)
## 1.5.2 (2017-02-14)
diff --git a/templates/components/products/options/product-list.html b/templates/components/products/options/product-list.html
index 60f5e5b484..19bd77fdb5 100644
--- a/templates/components/products/options/product-list.html
+++ b/templates/components/products/options/product-list.html
@@ -43,14 +43,15 @@
{{/each}}
{{else}}
+ {{#unless required}}
+ {{/unless}}
{{#each values}}