diff --git a/litho-editor-core/src/main/java/com/facebook/litho/editor/EditorRegistry.kt b/litho-editor-core/src/main/java/com/facebook/litho/editor/EditorRegistry.kt
index 1b8a92f0278..42c3f7872b4 100644
--- a/litho-editor-core/src/main/java/com/facebook/litho/editor/EditorRegistry.kt
+++ b/litho-editor-core/src/main/java/com/facebook/litho/editor/EditorRegistry.kt
@@ -116,12 +116,7 @@ object EditorRegistry {
    */
   @JvmStatic
   fun write(c: Class<*>, f: Field?, node: Any?, values: EditorValue?): Boolean? {
-    val editor = getEditor(c) ?: return null
-    if (f == null || values == null) {
-      return null
-    } else {
-      return editor.write(f, node, values)
-    }
+    return getEditor(c)?.takeIf { f != null && values != null }?.write(f, node, values)
   }
 
   /**