diff --git a/assets/js/postcode-eu-autofill.js b/assets/js/postcode-eu-autofill.js
index 7e578c0..eb6d0e7 100644
--- a/assets/js/postcode-eu-autofill.js
+++ b/assets/js/postcode-eu-autofill.js
@@ -116,11 +116,10 @@
 		{
 			const addressPart = PostcodeNlAddressFieldMapping.mapping[key];
 
-			if (mappedValues.has(addressPart))
+			if (mappedValues.has(addressPart) && addressFields[key].length > 0)
 			{
-				addressFields[key]
-					.val(mappedValues.get(addressPart))
-					.trigger('change');
+				const field = addressFields[key].val(mappedValues.get(addressPart))[0];
+				field.dispatchEvent(new Event('change'));
 			}
 		}
 	}
diff --git a/postcodenl-address-autocomplete.php b/postcodenl-address-autocomplete.php
index 463d5bb..1a29b92 100644
--- a/postcodenl-address-autocomplete.php
+++ b/postcodenl-address-autocomplete.php
@@ -3,7 +3,7 @@
  * Plugin Name: Postcode.nl Address Autocomplete
  * Plugin URI: https://www.postcode.nl/en/services/adresdata/implementatie
  * Description: Reference implementation for Postcode.nl international address autocomplete for WooCommerce
- * Version: 2.0.3
+ * Version: 2.0.4
  * Author: Postcode.nl
  * Author URI: https://www.postcode.nl
  * Text Domain: postcodenl-address-autocomplete
diff --git a/src/PostcodeNl/AddressAutocomplete/Main.php b/src/PostcodeNl/AddressAutocomplete/Main.php
index 934abe1..e99a2de 100644
--- a/src/PostcodeNl/AddressAutocomplete/Main.php
+++ b/src/PostcodeNl/AddressAutocomplete/Main.php
@@ -10,7 +10,7 @@
 class Main
 {
 	/** @var string The version number of the plugin should be equal to the commented version number in ../../../postcodenl-address-autocomplete.php */
-	public const VERSION = '2.0.3';
+	public const VERSION = '2.0.4';
 
 	/** @var self Reference to own */
 	protected static $_instance;