diff --git a/src/Layout.c b/src/Layout.c
index 8c7fa5ec..baa2d2cc 100644
--- a/src/Layout.c
+++ b/src/Layout.c
@@ -496,7 +496,9 @@ static void layoutNodeImpl(css_node_t *node, float parentMaxWidth, css_direction
           getPaddingAndBorderAxis(node, CSS_FLEX_DIRECTION_COLUMN);
       }
     }
-    return;
+    if (node->children_count == 0) {
+      return;
+    }
   }
 
   int i;
diff --git a/src/Layout.js b/src/Layout.js
index 1653d705..6d09517a 100755
--- a/src/Layout.js
+++ b/src/Layout.js
@@ -392,7 +392,9 @@ var computeLayout = (function() {
             getPaddingAndBorderAxis(node, CSS_FLEX_DIRECTION_COLUMN);
         }
       }
-      return;
+      if (node.children.length === 0) {
+        return;
+      }
     }
 
     var/*int*/ i;
diff --git a/src/java/src/com/facebook/csslayout/LayoutEngine.java b/src/java/src/com/facebook/csslayout/LayoutEngine.java
index 5458f92b..c96dd17c 100644
--- a/src/java/src/com/facebook/csslayout/LayoutEngine.java
+++ b/src/java/src/com/facebook/csslayout/LayoutEngine.java
@@ -481,7 +481,9 @@ public class LayoutEngine {
             getPaddingAndBorderAxis(node, CSSFlexDirection.COLUMN);
         }
       }
-      return;
+      if (node.getChildCount() == 0) {
+        return;
+      }
     }
   
     int i;