diff --git a/java/com/facebook/yoga/YogaNode.java b/java/com/facebook/yoga/YogaNode.java
index c53aecc6..08edbd46 100644
--- a/java/com/facebook/yoga/YogaNode.java
+++ b/java/com/facebook/yoga/YogaNode.java
@@ -382,7 +382,7 @@ public class YogaNode implements YogaNodeAPI<YogaNode> {
   @Override
   public YogaValue getMargin(YogaEdge edge) {
     if (!mHasSetMargin) {
-      return edge.intValue() < YogaEdge.START.intValue() ? YogaValue.ZERO : YogaValue.UNDEFINED;
+      return YogaValue.UNDEFINED;
     }
     return (YogaValue) jni_YGNodeStyleGetMargin(mNativePointer, edge.intValue());
   }
@@ -405,7 +405,7 @@ public class YogaNode implements YogaNodeAPI<YogaNode> {
   @Override
   public YogaValue getPadding(YogaEdge edge) {
     if (!mHasSetPadding) {
-      return edge.intValue() < YogaEdge.START.intValue() ? YogaValue.ZERO : YogaValue.UNDEFINED;
+      return YogaValue.UNDEFINED;
     }
     return (YogaValue) jni_YGNodeStyleGetPadding(mNativePointer, edge.intValue());
   }
@@ -428,7 +428,7 @@ public class YogaNode implements YogaNodeAPI<YogaNode> {
   @Override
   public float getBorder(YogaEdge edge) {
     if (!mHasSetBorder) {
-      return edge.intValue() < YogaEdge.START.intValue() ? 0 : YogaConstants.UNDEFINED;
+      return YogaConstants.UNDEFINED;
     }
     return jni_YGNodeStyleGetBorder(mNativePointer, edge.intValue());
   }
diff --git a/java/tests/com/facebook/yoga/YogaNodeTest.java b/java/tests/com/facebook/yoga/YogaNodeTest.java
index e5575d46..5b21a28e 100644
--- a/java/tests/com/facebook/yoga/YogaNodeTest.java
+++ b/java/tests/com/facebook/yoga/YogaNodeTest.java
@@ -230,4 +230,16 @@ public class YogaNodeTest {
     assertEquals(5, (int) node.getLayoutPadding(YogaEdge.TOP));
     assertEquals(5, (int) node.getLayoutPadding(YogaEdge.BOTTOM));
   }
+
+  @Test
+  public void testDefaultEdgeValues() {
+    final YogaNode node = new YogaNode();
+
+    for (YogaEdge edge : YogaEdge.values()) {
+      assertEquals(YogaUnit.UNDEFINED, node.getMargin(edge).unit);
+      assertEquals(YogaUnit.UNDEFINED, node.getPadding(edge).unit);
+      assertEquals(YogaUnit.UNDEFINED, node.getPosition(edge).unit);
+      assertTrue(YogaConstants.isUndefined(node.getBorder(edge)));
+    }
+  }
 }