diff --git a/backend/app.hopps.fin/src/main/java/app/hopps/fin/jpa/entities/Address.java b/backend/app.hopps.fin/src/main/java/app/hopps/fin/jpa/entities/Address.java
index e979bce..91f7b4b 100644
--- a/backend/app.hopps.fin/src/main/java/app/hopps/fin/jpa/entities/Address.java
+++ b/backend/app.hopps.fin/src/main/java/app/hopps/fin/jpa/entities/Address.java
@@ -15,7 +15,6 @@ public class Address {
     private String country;
     private String state;
     private String street;
-    private String streetNumber;
     private String zipCode;
 
     public long getId() {
@@ -61,12 +60,4 @@ public String getStreet() {
     public void setStreet(String street) {
         this.street = street;
     }
-
-    public String getStreetNumber() {
-        return streetNumber;
-    }
-
-    public void setStreetNumber(String streetNumber) {
-        this.streetNumber = streetNumber;
-    }
 }
diff --git a/backend/app.hopps.fin/src/main/java/app/hopps/fin/kafka/model/AddressHelper.java b/backend/app.hopps.fin/src/main/java/app/hopps/fin/kafka/model/AddressHelper.java
index ebdbe4e..ad97ce7 100644
--- a/backend/app.hopps.fin/src/main/java/app/hopps/fin/kafka/model/AddressHelper.java
+++ b/backend/app.hopps.fin/src/main/java/app/hopps/fin/kafka/model/AddressHelper.java
@@ -14,8 +14,7 @@ public static Address convertToJpa(app.hopps.commons.Address address) {
         addressJpa.setZipCode(address.postalCode());
         addressJpa.setState(address.state());
         addressJpa.setCity(address.city());
-        addressJpa.setStreet(address.road());
-        addressJpa.setStreetNumber(address.houseNumber());
+        addressJpa.setStreet(address.road() + " " + address.houseNumber());
         return addressJpa;
     }
 
@@ -26,7 +25,6 @@ public static Address convertToJpa(TradeParty tradeParty) {
         addressJpa.setState(null);
         addressJpa.setCity(tradeParty.getLocation());
         addressJpa.setStreet(tradeParty.getStreet());
-        addressJpa.setStreetNumber(null);
         return addressJpa;
     }
 }