diff --git a/apps/location/transfer_data.py b/apps/location/transfer_data.py
index 25ec3841..b5a8bd95 100644
--- a/apps/location/transfer_data.py
+++ b/apps/location/transfer_data.py
@@ -125,19 +125,14 @@ def transfer_cities():
         pprint(f"City serializer errors: {serialized_data.errors}")
 
 
+@atomic
 def transfer_addresses():
     queryset = transfer_models.Locations.objects.raw("""SELECT locations.id, locations.zip_code, locations.longitude, 
                                       locations.latitude, locations.address, locations.city_id 
                                       FROM locations WHERE 
                                       locations.address != "" AND 
                                       locations.address IS NOT NULL AND 
-                                      locations.city_id IS NOT NULL AND 
-                                      locations.city_id IN (SELECT cities.id
-                                        FROM cities WHERE
-                                        region_code IS NOT NULL AND 
-                                        region_code != "" AND
-                                        country_code_2 IS NOT NULL AND 
-                                        country_code_2 != "")""")
+                                      locations.city_id IS NOT NULL""")
 
     queryset = [vars(query) for query in queryset]
 
diff --git a/apps/transfer/serializers/location.py b/apps/transfer/serializers/location.py
index 5adaf9fc..92556970 100644
--- a/apps/transfer/serializers/location.py
+++ b/apps/transfer/serializers/location.py
@@ -225,7 +225,7 @@ class AddressSerializer(serializers.ModelSerializer):
 
     def set_city(self, data):
         try:
-            city = models.City.objects.filter(old_id=data['city_id']).first()
+            city = models.City.objects.filter(mysql_id=data['city_id']).first()
         except models.City.DoesNotExist as e:
             raise ValueError(f"City not found with {data}: {e}")