diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index 0a1261f..3c67eb3 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -73,9 +73,8 @@ public function form(array $form, FormStateInterface $form_state) {
     if (($request_uuid = \Drupal::request()->query->get('uuid')) && $preview = $store->get($request_uuid)) {
       /** @var $preview \Drupal\Core\Form\FormStateInterface */
 
-      foreach ($preview->getValues() as $name => $value) {
-        $form_state->setValue($name, $value);
-      }
+      $form_state->setStorage($preview->getStorage());
+      $form_state->setValues($preview->getValues());
 
       // Rebuild the form.
       $form_state->setRebuild();