diff --git a/assets/apps/customizer-controls/src/repeater/Repeater.js b/assets/apps/customizer-controls/src/repeater/Repeater.js
index 66daf9663a..af0132dfcf 100644
--- a/assets/apps/customizer-controls/src/repeater/Repeater.js
+++ b/assets/apps/customizer-controls/src/repeater/Repeater.js
@@ -44,7 +44,7 @@ const Repeater = ({
 		for (const [field] of Object.entries(itemFields)) {
 			newItem.visibility = 'yes';
 
-			if (typeof value[0][field] === 'boolean') {
+			if (typeof value[0]?.[field] === 'boolean') {
 				newItem[field] = true;
 				if (field === 'hide_on_mobile') {
 					newItem[field] = false;
diff --git a/assets/apps/customizer-controls/src/repeater/RepeaterItemContent.js b/assets/apps/customizer-controls/src/repeater/RepeaterItemContent.js
index 27d86f559f..0ec169a4fe 100644
--- a/assets/apps/customizer-controls/src/repeater/RepeaterItemContent.js
+++ b/assets/apps/customizer-controls/src/repeater/RepeaterItemContent.js
@@ -169,7 +169,40 @@ const RepeaterItemContent = ({
 					/>
 				);
 			case 'switcher':
-				return <Switcher fieldId={key} currentField={currentField} />;
+				const selectedOption =
+					value[index][key] || Object.keys(currentField.options)[0];
+
+				return (
+					<>
+						<ButtonGroup className="neve-background-type-control">
+							{Object.entries(currentField.options).map(
+								([optionKey, option]) => {
+									return (
+										<Button
+											key={optionKey}
+											isPrimary={
+												optionKey === selectedOption
+											}
+											isSecondary={
+												optionKey !== selectedOption
+											}
+											onClick={() => {
+												changeContent(key, optionKey);
+											}}
+										>
+											{option.label}
+										</Button>
+									);
+								}
+							)}
+						</ButtonGroup>
+						{currentField.options?.[selectedOption]?.fields.map(
+							(componentId) => {
+								return toComponent(componentId, value[index]);
+							}
+						)}
+					</>
+				);
 			case 'media':
 				return (
 					<Placeholder
@@ -217,39 +250,6 @@ const RepeaterItemContent = ({
 		}
 	};
 
-	const Switcher = ({ fieldId, currentField }) => {
-		const selectedOption =
-			value[index][fieldId] || Object.keys(currentField.options)[0];
-
-		return (
-			<>
-				<ButtonGroup className="neve-background-type-control">
-					{Object.entries(currentField.options).map(
-						([optionKey, option]) => {
-							return (
-								<Button
-									key={optionKey}
-									isPrimary={optionKey === selectedOption}
-									isSecondary={optionKey !== selectedOption}
-									onClick={() => {
-										changeContent(fieldId, optionKey);
-									}}
-								>
-									{option.label}
-								</Button>
-							);
-						}
-					)}
-				</ButtonGroup>
-				{currentField.options?.[selectedOption]?.fields.map(
-					(componentId) => {
-						return toComponent(componentId, value[index]);
-					}
-				)}
-			</>
-		);
-	};
-
 	return (
 		<div
 			className={classNames('sortable-subcontrols', {
diff --git a/globals/sanitize-functions.php b/globals/sanitize-functions.php
index 73775a78d4..47fe9d1489 100644
--- a/globals/sanitize-functions.php
+++ b/globals/sanitize-functions.php
@@ -346,6 +346,7 @@ function neve_sanitize_meta_repeater( $value ) {
 		'field',
 		'format',
 		'fallback',
+		'__kbKey',
 	];
 
 	if ( empty( $value ) ) {