diff --git a/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php b/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
--- a/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
+++ b/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
@@ -158,11 +158,11 @@
           // If we don't have an explicit value, don't make any adjustments.
           break;
       }
-    }
 
-    // If the field isn't lockable, remove any lock we applied.
-    if (!$field->getIsLockable()) {
-      $field->setIsLocked(false);
+      // If the field isn't lockable, remove any lock we applied.
+      if (!$field->getIsLockable()) {
+        $field->setIsLocked(false);
+      }
     }
 
     $fields = $this->reorderFields($fields);