diff --git a/src/com/practicsbs/saftpt/data/ExportHeader.java b/src/com/practicsbs/saftpt/data/ExportHeader.java
index 9a143c2..4f80d44 100644
--- a/src/com/practicsbs/saftpt/data/ExportHeader.java
+++ b/src/com/practicsbs/saftpt/data/ExportHeader.java
@@ -134,7 +134,8 @@
     String addDetail = headerAdressData.address1 + " " + headerAdressData.address2;
     address.setAddressDetail(addDetail.trim());
 
-    address.setCity(headerAdressData.city);
+    String city = headerAdressData.city;
+    address.setCity(city.length() > 50 ? city.substring(0, 50) : city);
     address.setPostalCode(headerAdressData.postal.trim());
     if (!headerAdressData.regionname.isEmpty())
       address.setRegion(headerAdressData.regionname);
diff --git a/src/com/practicsbs/saftpt/data/ExportMFSupplier.java b/src/com/practicsbs/saftpt/data/ExportMFSupplier.java
index 6f25293..5f56ad4 100644
--- a/src/com/practicsbs/saftpt/data/ExportMFSupplier.java
+++ b/src/com/practicsbs/saftpt/data/ExportMFSupplier.java
@@ -113,7 +113,8 @@
       String addressDetail = new String(bpAddress.address1 + " " + bpAddress.address2);
 
       address.setAddressDetail(addressDetail.substring(0, Math.min(addressDetail.length(), 59)));
-      address.setCity(bpAddress.city.equals("") ? UNKNOWN : bpAddress.city);
+      address.setCity(bpAddress.city.equals("") ? UNKNOWN
+          : bpAddress.city.length() > 50 ? bpAddress.city.substring(0, 50) : bpAddress.city);
       address.setPostalCode(bpAddress.postal.equals("") ? UNKNOWN : bpAddress.postal);
       if (bpAddress.regionname.length() > 0)
         address.setRegion(bpAddress.regionname);
diff --git a/src/com/practicsbs/saftpt/data/Utils.java b/src/com/practicsbs/saftpt/data/Utils.java
index 87b2011..04132ec 100644
--- a/src/com/practicsbs/saftpt/data/Utils.java
+++ b/src/com/practicsbs/saftpt/data/Utils.java
@@ -356,7 +356,8 @@
 
       address.setAddressDetail(
           addressDetail.equals("") || addressDetail.trim().length() < 5 ? UNKNOWN : addressDetail);
-      address.setCity(bpAddress.city.equals("") ? UNKNOWN : bpAddress.city);
+      address.setCity(bpAddress.city.equals("") ? UNKNOWN
+          : bpAddress.city.length() > 50 ? bpAddress.city.substring(0, 50) : bpAddress.city);
       address.setPostalCode(bpAddress.postal.equals("") ? UNKNOWN : bpAddress.postal);
       if (bpAddress.regionname.length() > 0)
         address.setRegion(bpAddress.regionname);