diff --git a/js/forms/custom-elements/tom-select.js b/js/forms/custom-elements/tom-select.js
index e90483ae8..8b28c4fde 100644
--- a/js/forms/custom-elements/tom-select.js
+++ b/js/forms/custom-elements/tom-select.js
@@ -19,7 +19,7 @@ class TomSelectElement extends HTMLSelectElement {
 		if (this.getAttribute('data-tom-select-disable-auto-complete')) {
 			options.controlInput = null;
 		}
-		if (this.getAttribute('data-tom-select-max-items-selected')) {
+		if (this.getAttribute('data-tom-select-max-items-selected') && this.getAttribute('data-tom-select-max-items-selected') !== '') {
 			options.maxItems = parseInt(this.getAttribute('data-tom-select-max-items-selected'));
 		}
 		if (this.getAttribute('data-tom-select-placehelder')) {
diff --git a/sources/Forms/FormType/Base/ChoiceFormType.php b/sources/Forms/FormType/Base/ChoiceFormType.php
index d3469e8f0..39137a896 100644
--- a/sources/Forms/FormType/Base/ChoiceFormType.php
+++ b/sources/Forms/FormType/Base/ChoiceFormType.php
@@ -36,7 +36,7 @@ class ChoiceFormType extends AbstractType
 
 		// options to control the inline display of choices
 		$resolver->setDefault('inline_display', true);
-		$resolver->setDefined('max_items_selected');
+		$resolver->setDefault('max_items_selected', '');
 		$resolver->setDefault('disable_auto_complete', true);
 	}