diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index b5612e922e..b75ebcbca0 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -47,5 +47,6 @@
 }
 
 @mixin make-col-offset($size, $columns: $grid-columns) {
-  margin-left: percentage($size / $columns);
+  $num: $size / $columns;
+  margin-left: if($num == 0, 0, percentage($num));
 }