diff --git a/Source/ASDisplayNode+Layout.mm b/Source/ASDisplayNode+Layout.mm
index 9fbecf39f..d17136efe 100644
--- a/Source/ASDisplayNode+Layout.mm
+++ b/Source/ASDisplayNode+Layout.mm
@@ -1055,13 +1055,13 @@ - (ASLockSet)lockToRootIfNeededForLayout {
     if (!addLock(self)) {
       return NO;
     }
-    if (self.nodeController && !addLock(self.nodeController)) {
-      return NO;
-    }
 #if YOGA
     if (![self locked_shouldLayoutFromYogaRoot]) {
       return YES;
     }
+    if (self.nodeController && !addLock(self.nodeController)) {
+      return NO;
+    }
     ASDisplayNode *parent = _supernode;
     while (parent) {
       if (!addLock(parent)) {