diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89c6b6f961..d42c126118 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Draft
 - Swaps `writeReview` for `write_review` to fix email link issue [#1017](https://github.com/bigcommerce/cornerstone/pull/1017)
 - Maintenance page stylesheet fix [#1016](https://github.com/bigcommerce/cornerstone/pull/1016)
+- Restore four products per row on category pages when sidebar is empty. [#1018](https://github.com/bigcommerce/cornerstone/pull/1018)
 
 ## 1.8.1 (2017-05-05)
 - Bug fix for category sidebar [#1006](https://github.com/bigcommerce/cornerstone/pull/1006)
diff --git a/templates/pages/category.html b/templates/pages/category.html
index 04640f97b8..52976690f5 100644
--- a/templates/pages/category.html
+++ b/templates/pages/category.html
@@ -24,9 +24,11 @@ <h1 class="page-heading">{{category.name}}</h1>
 {{{category.description}}}
 {{{snippet 'categories'}}}
 <div class="page">
-    <aside class="page-sidebar" id="faceted-search-container">
-        {{> components/category/sidebar}}
-    </aside>
+    {{#or category.subcategories category.faceted_search_enabled category.shop_by_price}}
+        <aside class="page-sidebar" id="faceted-search-container">
+            {{> components/category/sidebar}}
+        </aside>
+    {{/or}}
 
     <main class="page-content" id="product-listing-container">
         {{#if category.products}}