diff --git a/layers/highway/highway.sql b/layers/highway/highway.sql
index 34d3e491..a6c14a26 100644
--- a/layers/highway/highway.sql
+++ b/layers/highway/highway.sql
@@ -35,8 +35,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class highway_class, subclass te
 		SELECT osm_id, geometry, highway, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
         FROM osm_highway_linestring
 		WHERE zoom_level = 12
-            --NOTE: We could already show residential roads - but we can save a lot of data by not doing so
-            AND to_highway_class(highway) < 'minor_road'::highway_class
+            AND (to_highway_class(highway) < 'minor_road'::highway_class OR highway IN ('unclassified', 'residential'))
             AND NOT highway_is_link(highway)
             AND NOT is_area
         UNION ALL