diff --git a/typo3/sysext/form/Classes/Hooks/HandleIncomingFormValues.php b/typo3/sysext/form/Classes/Hooks/HandleIncomingFormValues.php
index baedc006d447d8507cf67eba2a928cb58f47c7b2..06a867f3e977cde234378d8e99a493737b797d8a 100644
--- a/typo3/sysext/form/Classes/Hooks/HandleIncomingFormValues.php
+++ b/typo3/sysext/form/Classes/Hooks/HandleIncomingFormValues.php
@@ -72,7 +72,7 @@ class HandleIncomingFormValues implements SingletonInterface {
 				}
 			} else {
 				if (
-					$incomingData === $modelValue
+					(!empty($modelValue) && $incomingData === $modelValue)
 					|| $incomingData === $incomingName . '-' . $element->getElementCounter()
 				) {
 					$this->setAttribute($element, 'checked', 'checked');
@@ -98,7 +98,7 @@ class HandleIncomingFormValues implements SingletonInterface {
 			$checked = FALSE;
 			$incomingData = $formBuilder->getIncomingData()->getIncomingField($incomingName);
 			if (
-				$incomingData === $modelValue
+				(!empty($modelValue) && $incomingData === $modelValue)
 				|| $incomingData === $incomingName . '-' . $element->getElementCounter()
 			) {
 				$this->setAttribute($element, 'checked', 'checked');