diff --git a/lib/optimizer/level-1/optimize.js b/lib/optimizer/level-1/optimize.js
index 845fce446..bd8a8ba84 100644
--- a/lib/optimizer/level-1/optimize.js
+++ b/lib/optimizer/level-1/optimize.js
@@ -341,7 +341,7 @@ function optimizeZeroUnits(name, value) {
 }
 
 function removeQuotes(name, value) {
-  if (name == 'content' || name.indexOf('font-variation-settings') > -1 || name.indexOf('font-feature-settings') > -1 || name.indexOf('grid-') > -1) {
+  if (name == 'content' || name.indexOf('font-variation-settings') > -1 || name.indexOf('font-feature-settings') > -1 || name == 'grid' || name.indexOf('grid-') > -1) {
     return value;
   }
 
diff --git a/test/optimizer/level-1/optimize-test.js b/test/optimizer/level-1/optimize-test.js
index 7872dad31..91d33261e 100644
--- a/test/optimizer/level-1/optimize-test.js
+++ b/test/optimizer/level-1/optimize-test.js
@@ -1229,6 +1229,10 @@ vows.describe('level 1 optimizations')
         '.block{-webkit-font-feature-settings:"scmp","swsh" 2}',
         '.block{-webkit-font-feature-settings:"scmp","swsh" 2}'
       ],
+      'grid': [
+        '.block{grid:"header" 20% "nav" auto/auto}',
+        '.block{grid:"header" 20% "nav" auto/auto}'
+      ],
       'grid-template': [
         '.block{grid-template:"header" 20% "nav" auto}',
         '.block{grid-template:"header" 20% "nav" auto}'