diff --git a/CSSLayout/CSSLayout.c b/CSSLayout/CSSLayout.c
index d49acc02..c8fb9673 100644
--- a/CSSLayout/CSSLayout.c
+++ b/CSSLayout/CSSLayout.c
@@ -1040,7 +1040,8 @@ static void layoutNodeImpl(const CSSNodeRef node,
         child->layout.computedFlexBasis =
             fmaxf(child->style.dimensions[CSSDimensionHeight],
                   getPaddingAndBorderAxis(child, CSSFlexDirectionColumn));
-      } else if (!CSSValueIsUndefined(child->style.flexBasis)) {
+      } else if (!CSSValueIsUndefined(child->style.flexBasis) &&
+                 !CSSValueIsUndefined(availableInnerMainDim)) {
         child->layout.computedFlexBasis =
             fmaxf(child->style.flexBasis, getPaddingAndBorderAxis(child, mainAxis));
       } else {
diff --git a/java/com/facebook/csslayout/LayoutEngine.java b/java/com/facebook/csslayout/LayoutEngine.java
index e7108f08..f704879a 100644
--- a/java/com/facebook/csslayout/LayoutEngine.java
+++ b/java/com/facebook/csslayout/LayoutEngine.java
@@ -694,7 +694,7 @@ public class LayoutEngine {
 
           // The height is definite, so use that as the flex basis.
           child.layout.computedFlexBasis = Math.max(child.style.dimensions[DIMENSION_HEIGHT], ((child.style.padding.getWithFallback(leadingSpacing[CSS_FLEX_DIRECTION_COLUMN], leading[CSS_FLEX_DIRECTION_COLUMN]) + child.style.border.getWithFallback(leadingSpacing[CSS_FLEX_DIRECTION_COLUMN], leading[CSS_FLEX_DIRECTION_COLUMN])) + (child.style.padding.getWithFallback(trailingSpacing[CSS_FLEX_DIRECTION_COLUMN], trailing[CSS_FLEX_DIRECTION_COLUMN]) + child.style.border.getWithFallback(trailingSpacing[CSS_FLEX_DIRECTION_COLUMN], trailing[CSS_FLEX_DIRECTION_COLUMN]))));
-        } else if (!isFlexBasisAuto(child)) {
+        } else if (!isFlexBasisAuto(child) && !Float.isNaN(availableInnerMainDim)) {
 
           // If the basis isn't 'auto', it is assumed to be zero.
           child.layout.computedFlexBasis = Math.max(child.style.flexBasis, ((child.style.padding.getWithFallback(leadingSpacing[mainAxis], leading[mainAxis]) + child.style.border.getWithFallback(leadingSpacing[mainAxis], leading[mainAxis])) + (child.style.padding.getWithFallback(trailingSpacing[mainAxis], trailing[mainAxis]) + child.style.border.getWithFallback(trailingSpacing[mainAxis], trailing[mainAxis]))));
diff --git a/tests/CSSLayoutFlexTest.cpp b/tests/CSSLayoutFlexTest.cpp
index 05750443..7e10c040 100644
--- a/tests/CSSLayoutFlexTest.cpp
+++ b/tests/CSSLayoutFlexTest.cpp
@@ -162,35 +162,3 @@ TEST(CSSLayoutTest, flex_basis_flex_shrink_row) {
   ASSERT_EQ(50, CSSNodeLayoutGetWidth(root_child1));
   ASSERT_EQ(100, CSSNodeLayoutGetHeight(root_child1));
 }
-
-TEST(CSSLayoutTest, flex_basis_flex_grow_undefined_main) {
-  const CSSNodeRef root = CSSNodeNew();
-  CSSNodeStyleSetWidth(root, 100);
-
-  const CSSNodeRef root_child0 = CSSNodeNew();
-  CSSNodeStyleSetFlexGrow(root_child0, 1);
-  CSSNodeStyleSetFlexBasis(root_child0, 100);
-  CSSNodeStyleSetWidth(root_child0, 100);
-  CSSNodeInsertChild(root, root_child0, 0);
-
-  const CSSNodeRef root_child1 = CSSNodeNew();
-  CSSNodeStyleSetFlexBasis(root_child1, 50);
-  CSSNodeStyleSetWidth(root_child1, 100);
-  CSSNodeInsertChild(root, root_child1, 1);
-  CSSNodeCalculateLayout(root, CSSUndefined, CSSUndefined, CSSDirectionLTR);
-
-  ASSERT_EQ(0, CSSNodeLayoutGetLeft(root));
-  ASSERT_EQ(0, CSSNodeLayoutGetTop(root));
-  ASSERT_EQ(100, CSSNodeLayoutGetWidth(root));
-  ASSERT_EQ(150, CSSNodeLayoutGetHeight(root));
-
-  ASSERT_EQ(0, CSSNodeLayoutGetLeft(root_child0));
-  ASSERT_EQ(0, CSSNodeLayoutGetTop(root_child0));
-  ASSERT_EQ(100, CSSNodeLayoutGetWidth(root_child0));
-  ASSERT_EQ(100, CSSNodeLayoutGetHeight(root_child0));
-
-  ASSERT_EQ(0, CSSNodeLayoutGetLeft(root_child1));
-  ASSERT_EQ(100, CSSNodeLayoutGetTop(root_child1));
-  ASSERT_EQ(100, CSSNodeLayoutGetWidth(root_child1));
-  ASSERT_EQ(50, CSSNodeLayoutGetHeight(root_child1));
-}