diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/Controls/ControlTextInput.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/Controls/ControlTextInput.js
index 37978c24e..43d246dda 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/Controls/ControlTextInput.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/Controls/ControlTextInput.js
@@ -10,7 +10,7 @@ const ControlTextInput = ( {
 } ) => (
 	<Action>
 		<TextControl
-			__nextHasNoMarginBottom={ true }
+			__nextHasNoMarginBottom
 			className="ppcp-r-vertical-text-control"
 			placeholder={ placeholder }
 			value={ value }
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Components/ManualConnectionForm.js b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Components/ManualConnectionForm.js
index a846cf843..6602c335b 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Components/ManualConnectionForm.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Components/ManualConnectionForm.js
@@ -151,6 +151,7 @@ const ManualConnectionForm = () => {
 				setToggled={ setManualConnectionMode }
 			>
 				<DataStoreControl
+					__nextHasNoMarginBottom
 					control={ TextControl }
 					ref={ refClientId }
 					label={ clientIdLabel }
@@ -166,6 +167,7 @@ const ManualConnectionForm = () => {
 					</p>
 				) }
 				<DataStoreControl
+					__nextHasNoMarginBottom
 					control={ TextControl }
 					ref={ refClientSecret }
 					label={ secretKeyLabel }