diff --git a/assets/js/extensions/shipping-methods/pickup-location/edit-location/form.tsx b/assets/js/extensions/shipping-methods/pickup-location/edit-location/form.tsx
index 8f007f2bf4e..7deef62e54a 100644
--- a/assets/js/extensions/shipping-methods/pickup-location/edit-location/form.tsx
+++ b/assets/js/extensions/shipping-methods/pickup-location/edit-location/form.tsx
@@ -11,10 +11,7 @@ import { getSetting } from '@woocommerce/settings';
 import type { PickupLocation } from '../types';
 
 // Outputs the list of countries and states in a single dropdown select.
-const countryStateDropdownOptions = (
-	selectedCountry = '',
-	selectedState = ''
-) => {
+const countryStateDropdownOptions = () => {
 	const countries = getSetting< Record< string, string > >( 'countries', [] );
 	const states = getSetting< Record< string, Record< string, string > > >(
 		'countryStates',
@@ -40,29 +37,14 @@ const countryStateDropdownOptions = (
 		} ) );
 		return {
 			label: countries[ country ],
-			options: [
-				// {
-				// 	value: country,
-				// 	label: countries[ country ],
-				// },
-				...stateOptions,
-			],
+			options: [ ...stateOptions ],
 		};
 	} );
-	const selectedCountryState = `${ selectedCountry }:${ selectedState }`;
-	const selectedCountryStateOption = countryStateOptions
-		.map( ( option ) => option.options )
-		.flat()
-		.find( ( option ) => option.value === selectedCountryState );
-	// const selectedCountryOption = countryStateOptions.find(
-	// 	( option ) => option.options[ 0 ].value === selectedCountry
-	// );
-	const selectedOption = selectedCountryStateOption || '';
 	return {
 		options: countryStateOptions,
-		selected: selectedOption,
 	};
 };
+const countryStateOptions = countryStateDropdownOptions();
 
 const Form = ( {
 	formRef,
@@ -74,10 +56,6 @@ const Form = ( {
 	setValues: React.Dispatch< React.SetStateAction< PickupLocation > >;
 } ) => {
 	const { country: selectedCountry, state: selectedState } = values.address;
-	const countryStateOptions = countryStateDropdownOptions(
-		selectedCountry,
-		selectedState
-	);
 	const states = getSetting< Record< string, Record< string, string > > >(
 		'countryStates',
 		[]
@@ -161,12 +139,12 @@ const Form = ( {
 			<SelectControl
 				name="location_country_state"
 				label={ __(
-					'Country / Region',
+					'Country / State',
 					'woo-gutenberg-products-block'
 				) }
 				hideLabelFromVision={ true }
 				placeholder={ __(
-					'Country / Region',
+					'Country / State',
 					'woo-gutenberg-products-block'
 				) }
 				value={ `${ selectedCountry }${
@@ -214,7 +192,7 @@ const Form = ( {
 			{ ! countryHasStates && (
 				<TextControl
 					placeholder={ __(
-						'State / County',
+						'State',
 						'woo-gutenberg-products-block'
 					) }
 					value={ selectedState }
diff --git a/assets/js/extensions/shipping-methods/pickup-location/edit-location/state-control.tsx b/assets/js/extensions/shipping-methods/pickup-location/edit-location/state-control.tsx
deleted file mode 100644
index 07ea29ef92a..00000000000
--- a/assets/js/extensions/shipping-methods/pickup-location/edit-location/state-control.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * External dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { SelectControl, TextControl } from '@wordpress/components';
-
-const StateControl = ( {
-	states,
-	currentCountry,
-	...props
-}: {
-	states: Record< string, Record< string, string > >;
-	currentCountry: string;
-} ): JSX.Element | null => {
-	const filteredStates = states[ currentCountry ] || [];
-
-	if ( filteredStates.length === 0 ) {
-		return (
-			<TextControl
-				{ ...props }
-				disabled={ ! currentCountry || props.disabled }
-			/>
-		);
-	}
-	return (
-		<SelectControl
-			{ ...props }
-			options={ [
-				{
-					value: '',
-					disabled: true,
-					label: __( 'State', 'woo-gutenberg-products-block' ),
-				},
-				...Object.entries( filteredStates ).map(
-					( [ code, state ] ) => ( {
-						value: code,
-						label: state,
-					} )
-				),
-			] }
-		/>
-	);
-};
-
-export default StateControl;