diff --git a/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.js b/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.js
index 1e2ee29a7..4d3e1e6da 100644
--- a/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.js
+++ b/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.js
@@ -568,11 +568,11 @@ Vue.component('warehouse-shipping-note', {
             if (this.$refs.modal) {
                 // Parse address string
                 const locationParts = event.location.split(',');
-                const line = locationParts.slice(0, -1).join(',').trim();
-                const plzCityRaw = locationParts.slice(-1)[0].trim();
-                const plzMatch = plzCityRaw.match(/^(\\d+)/);
+                const line = locationParts[0].trim();
+                const plzCityRaw = locationParts[1].trim();
+                const plzMatch = plzCityRaw.match(/^(\d+)/);
                 const plz = plzMatch ? plzMatch[1] : '';
-                const city = plzCityRaw.replace(/^\\d+\\s*/, '').trim();
+                const city = plzCityRaw.replace(/^\d+\s*/, '').trim();
 
                 // Create metadata object
                 const eventTypeMap = {