diff --git a/README.md b/README.md
index 9c70b2f..2082f46 100644
--- a/README.md
+++ b/README.md
@@ -31,14 +31,14 @@ Then you can use it like:
 
 ```html
 <input 
-    v-on:change="window.app.$emit('postcode-change', addressVariables)" 
+    v-on:change="window.$emit('postcode-change', addressVariables)" 
     name="postcode" 
     label="Postcode" 
     v-model="addressVariables.postcode" 
     required
 />
 <input 
-    v-on:change="window.app.$emit('postcode-change', addressVariables)" 
+    v-on:change="window.$emit('postcode-change', addressVariables)" 
     name="street[1]" 
     type="number" 
     label="Housenumber" 
diff --git a/composer.json b/composer.json
index 1703b23..bc519d0 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     "prefer-stable": true,
     "require": {
         "php": "^8.1",
-        "rapidez/core": "^2.8|^3.0|^4.0"
+        "rapidez/core": "^5.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/resources/js/package.js b/resources/js/package.js
index 83c2eec..c491e49 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -1,11 +1,5 @@
-import { set, useDebounceFn, useMemoize } from '@vueuse/core'
-
-document.addEventListener('vue:loaded', function () {
-    window.app.$on(
-        'postcode-change',
-        useDebounceFn(updateAddressFromPro6pp, 100),
-    )
-})
+import { useDebounceFn, useMemoize } from '@vueuse/core'
+import { on } from 'Vendor/rapidez/core/resources/js/polyfills/emit.js'
 
 const getAddressFromPro6pp = useMemoize(async function (postcode, housenumber) {
     return window.rapidezAPI(
@@ -40,12 +34,14 @@ async function updateAddressFromPro6pp(address) {
             response?.error == 'nl_sixpp not found' ||
             response?.error == 'Streetnumber not found'
         ) {
-            set(address, 'city', '')
-            set(address.street, 0, '')
+            address.city = ''
+            address.street[0] = ''
         }
         return
     }
 
-    set(address, 'city', foundAddress.city)
-    set(address.street, 0, foundAddress.street)
+    address.city = foundAddress.city
+    address.street[0] = foundAddress.street
 }
+
+on('postcode-change', useDebounceFn(updateAddressFromPro6pp, 100), { autoremove: false })