diff --git a/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java b/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
index 12c3e8ab..005555da 100644
--- a/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
+++ b/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
@@ -455,6 +455,9 @@ private void setMeasuredDimensionForFlex(@FlexDirection int flexDirection, int w
                 throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
         }
 
+        calculatedMaxWidth = Math.max(calculatedMaxWidth, getSuggestedMinimumWidth());
+        calculatedMaxHeight = Math.max(calculatedMaxHeight, getSuggestedMinimumHeight());
+
         int widthSizeAndState;
         switch (widthMode) {
             case MeasureSpec.EXACTLY: