diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 87b4ac94a6..585c80f27d 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -7,7 +7,10 @@
   margin-left: auto;
   padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
-  @include clearfix();
+  @if $enable-flex {
+  } @else {
+    @include clearfix();
+  }
 }