diff --git a/layers/poi/class.sql b/layers/poi/class.sql
index a36fbdfa..0f4323bc 100644
--- a/layers/poi/class.sql
+++ b/layers/poi/class.sql
@@ -33,6 +33,8 @@ CREATE OR REPLACE FUNCTION poi_class(subclass text, mapping_key text)
     RETURNS text AS
 $$
 SELECT CASE
+           -- Special case subclass collision between office=university and amenity=university
+           WHEN mapping_key = 'amenity' AND subclass = 'university' THEN 'college'
            %%FIELD_MAPPING: class %%
            ELSE subclass
            END;