diff --git a/scripts/geodata/osm/formatter.py b/scripts/geodata/osm/formatter.py
index df4d9f76..c0ac29f1 100644
--- a/scripts/geodata/osm/formatter.py
+++ b/scripts/geodata/osm/formatter.py
@@ -912,8 +912,6 @@ class OSMAddressFormatter(object):
         if building_components:
             num_floors = self.num_floors(building_components)
 
-            building_is_rail_station = self.is_rail_station(building_components)
-
             num_basements = self.num_floors(building_components, key='building:levels:underground')
 
             for building_tags in building_components:
@@ -925,6 +923,8 @@ class OSMAddressFormatter(object):
                     elif k == AddressFormatter.HOUSE:
                         building_venue_names.append(v)
 
+                    building_is_rail_station = building_is_rail_station or self.is_rail_station(building_tags)
+
         subdivision_components = self.subdivision_components(latitude, longitude)
         if subdivision_components:
             zone = self.zone(subdivision_components)