diff --git a/templates.dist/fields.php b/templates.dist/fields.php
index 1e5a885b0..db9bfef62 100644
--- a/templates.dist/fields.php
+++ b/templates.dist/fields.php
@@ -207,13 +207,13 @@ function renderFormField(string $fieldName, onOffice\WPlugin\Form $pForm, bool $
 			} elseif ($typeCurrentInput === FieldTypes::FIELD_TYPE_DATATYPE_TINYINT) {
 				$output = '<fieldset>
 					<input type="radio" id="' . esc_attr($fieldName) . '_u" name="' . esc_attr($fieldName) . '" value=""
-						' . ($selectedValue === null ? ' checked' : '') . '>
+						' . ($selectedValue == '' ? ' checked' : '') . '>
 					<label for="' . esc_attr($fieldName) . '_u">' . esc_html__('Not Specified', 'onoffice-for-wp-websites') . '</label>
 					<input type="radio" id="' . esc_attr($fieldName) . '_y" name="' . esc_attr($fieldName) . '" value="1"
-						' . ($selectedValue == 2 ? 'checked' : '') . '>
+						' . ($selectedValue == 1 ? 'checked' : '') . '>
 					<label for="' . esc_attr($fieldName) . '_y">' . esc_html__('Yes', 'onoffice-for-wp-websites') . '</label>
 					<input type="radio" id="' . esc_attr($fieldName) . '_n" name="' . esc_attr($fieldName) . '" value="0"
-						' . ($selectedValue == 1 ? 'checked' : '') . '>
+						' . ($selectedValue == 0 ? 'checked' : '') . '>
 					<label for="' . esc_attr($fieldName) . '_n">' . esc_html__('No', 'onoffice-for-wp-websites') . '</label>
 					</fieldset>';
 			} else {