diff --git a/CHANGELOG.md b/CHANGELOG.md
index a03d9ef2..d1837057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Postal Code autocomplete which should only call API if country is supported
+
 ## [3.8.3] - 2019-11-27
 
 ### Fixed
diff --git a/react/AddressContainer.js b/react/AddressContainer.js
index c56377a7..c2a12c37 100644
--- a/react/AddressContainer.js
+++ b/react/AddressContainer.js
@@ -53,13 +53,17 @@ class AddressContainer extends Component {
       changedAddressFields.postalCode &&
       !changedAddressFields.postalCode.geolocationAutoCompleted
     ) {
+      const postalCodeField = rules.fields.find(
+        field => field.name === 'postalCode',
+      )
       const diffFromPrev =
         address.postalCode.value !== validatedAddress.postalCode.value
       const isValidPostalCode = validatedAddress.postalCode.valid === true
       const shouldAutoComplete =
         rules.postalCodeFrom === POSTAL_CODE &&
         diffFromPrev &&
-        isValidPostalCode
+        isValidPostalCode &&
+        postalCodeField.postalCodeAPI
 
       if (shouldAutoComplete) {
         return onChangeAddress(
diff --git a/react/country/default.js b/react/country/default.js
index b808e940..15b2fabd 100644
--- a/react/country/default.js
+++ b/react/country/default.js
@@ -18,6 +18,7 @@ export default {
       label: 'postalCode',
       size: 'small',
       autoComplete: 'nope',
+      postalCodeAPI: false,
     },
     {
       name: 'street',