diff --git a/lib/Form/Block/Checkbox.php b/lib/Form/Block/Checkbox.php
index d7617d0a09..cb8ac2f028 100644
--- a/lib/Form/Block/Checkbox.php
+++ b/lib/Form/Block/Checkbox.php
@@ -18,6 +18,8 @@ class Checkbox extends Base {
       : array()
     );
 
+    $selected_value = self::getFieldValue($block);
+
     foreach($options as $option) {
       $html .= '<label class="mailpoet_checkbox_label">';
       $html .= '<input type="hidden" name="'.$field_name.'" value="" />';
@@ -28,9 +30,11 @@ class Checkbox extends Base {
       $html .= 'value="1" ';
 
       $html .= (
-        (isset($option['is_checked']) && $option['is_checked'])
-        ||
-        (self::getFieldValue($block))
+        (
+          $selected_value === ''
+          && isset($option['is_checked'])
+          && $option['is_checked']
+        ) || ($selected_value === $value)
       ) ? 'checked="checked"' : '';
 
       $html .= $field_validation;
diff --git a/lib/Form/Block/Radio.php b/lib/Form/Block/Radio.php
index 4eccf1aa5f..c9862aac57 100644
--- a/lib/Form/Block/Radio.php
+++ b/lib/Form/Block/Radio.php
@@ -18,6 +18,8 @@ class Radio extends Base {
       : array()
     );
 
+    $selected_value = self::getFieldValue($block);
+
     foreach($options as $option) {
       $html .= '<label class="mailpoet_radio_label">';
 
@@ -36,9 +38,11 @@ class Radio extends Base {
       $html .= 'value="'.esc_attr($value).'" ';
 
       $html .= (
-        (isset($option['is_checked']) && $option['is_checked'])
-        ||
-        (self::getFieldValue($block) === $value)
+        (
+          $selected_value === ''
+          && isset($option['is_checked'])
+          && $option['is_checked']
+        ) || ($selected_value === $value)
       ) ? 'checked="checked"' : '';
 
       $html .= $field_validation;