Is there a workaround to make sure my location specifically city will only show the right country?

Summary:

I did setup my city and country flexfields (validation type) as Independent and now whenever I choose my location - City then country, all of the countries show. Is there a workaround to make sure that only the country of my specified city will show up when I do transactions in FA? I know that changing the validation type from independent to dependent is impossible.

Content (please ensure you mask any confidential information):

Version (include the version you are using, if applicable):

Code Snippet (add any code snippets that support your topic, if applicable):