diff --git a/assets/js/src/form_editor/blocks/divider/edit.tsx b/assets/js/src/form_editor/blocks/divider/edit.tsx
index 29373584a6..db97d4da3a 100644
--- a/assets/js/src/form_editor/blocks/divider/edit.tsx
+++ b/assets/js/src/form_editor/blocks/divider/edit.tsx
@@ -46,15 +46,19 @@ const DividerEdit = ({ attributes, setAttributes }: Props) => {
         max={40}
         allowReset
         onChange={(dividerHeight) => {
+          let newHeight = attributeHeight;
+          if (dividerHeight !== undefined) {
+            newHeight = Math.max(dividerHeight, attributeHeight);
+          }
           setAttributes({
             dividerHeight,
-            height: Math.max(dividerHeight, attributes.height),
+            height: newHeight,
           });
         }}
       />
       <RangeControl
         label={MailPoet.I18n.t('blockDividerDividerWidth')}
-        value={attributes.dividerWidth}
+        value={attributeDividerWidth}
         min={1}
         max={100}
         allowReset