diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java
index 04dde4dc2..8075e7fb3 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java
@@ -159,7 +159,10 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
       data.add(new Named<>("Layout", layoutData));
     }
 
-    data.addAll(getPropData(node));
+    final List<Named<FlipperObject>> propData = getPropData(node);
+    if (propData != null) {
+      data.addAll(propData);
+    }
 
     final FlipperObject stateData = getStateData(node);
     if (stateData != null) {