diff --git a/scss/_grid.scss b/scss/_grid.scss
index 1841b7faa7..2f58dc1ea8 100644
--- a/scss/_grid.scss
+++ b/scss/_grid.scss
@@ -23,8 +23,10 @@
 //
 // Rows contain and clear the floats of your columns.
 
-.row {
-  @include make-row();
+@if $enable-grid-classes {
+  .row {
+    @include make-row();
+  }
 }
 
 
@@ -32,14 +34,16 @@
 //
 // Common styles for small and large grid columns
 
-@include make-grid-columns();
+@if $enable-grid-classes {
+  @include make-grid-columns();
+}
 
 
 // Flex variation
 //
 // Custom styles for additional flex alignment options.
 
-@if $enable-flex {
+@if $enable-flex and $enable-grid-classes {
 
   // Flex column reordering
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index cfaf954a15..a01c12440f 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -49,6 +49,7 @@ $enable-shadows:            false !default;
 $enable-gradients:          false !default;
 $enable-transitions:        false !default;
 $enable-hover-media-query:  false !default;
+$enable-grid-classes:       true !default;
 
 
 // Spacing