diff --git a/scss/_grid.scss b/scss/_grid.scss
index a71f3aaf24..d846f098c4 100644
--- a/scss/_grid.scss
+++ b/scss/_grid.scss
@@ -2,23 +2,24 @@
 //
 // Set the container width, and override it for fixed navbars in media queries.
 
-.container {
-  @include make-container();
-  @include make-container-max-widths();
-
+@if $enable-grid-classes {
+  .container {
+    @include make-container();
+    @include make-container-max-widths();
+  }
 }
 
-
 // Fluid container
 //
 // Utilizes the mixin meant for fixed width containers, but without any defined
 // width for fluid, full width layouts.
 
-.container-fluid {
-  @include make-container();
+@if $enable-grid-classes {
+  .container-fluid {
+    @include make-container();
+  }
 }
 
-
 // Row
 //
 // Rows contain and clear the floats of your columns.