diff --git a/webform_addmore.module b/webform_addmore.module
index fe43b96..8e07110 100644
--- a/webform_addmore.module
+++ b/webform_addmore.module
@@ -18,10 +18,30 @@
     '#description' => t('A single Add More fieldset will be displayed with an Add More button.'),
     '#default_value' => isset($settings[$form['cid']['#value']]) ? $settings[$form['cid']['#value']] : 0,
     '#weight' => 99,
+    '#parents' => array('extra', 'addmore')
   );
 }
 
 /**
+ * Implements hook_node_load().
+ *
+ * Load addmore value for webform components on node load.
+ */
+function webform_addmore_node_load($nodes, $types) {
+  foreach($nodes as $node) {
+    if(in_array($node->type, webform_variable_get('webform_node_types'))) {
+      if($settings = variable_get('webform_addmore_' . $node->nid, array())) {
+        foreach($node->webform['components'] as $cid => &$component) {
+          if(isset($settings[$cid])) {
+            $component['extra']['addmore'] = $settings[$cid];
+          }
+        }
+      }
+    }
+  }
+}
+
+/**
  * Save webform fieldset setting.
  *
  * @param $component
@@ -33,7 +53,7 @@
   }
 
   $settings = variable_get('webform_addmore_' . $component['nid'], array());
-  $settings[$component['cid']] = $component['display']['addmore'];
+  $settings[$component['cid']] = $component['extra']['addmore'];
   variable_set('webform_addmore_' . $component['nid'], $settings);
 }