diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index f7346f4a97..ba341a6ec8 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -36,7 +36,8 @@
       }
       .col#{$infix}-auto {
         flex: 0 0 auto;
-        max-width: none;
+        width: auto;
+        max-width: none; // Reset earlier grid tiers
       }
 
       @for $i from 1 through $columns {