diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 51514054fa..fee478d7aa 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -2594,6 +2594,7 @@ static ChangeInfoResult TownHouseChangeInfo(uint hid, int numinfo, int prop, Byt
 
 			case 0x22: // long maximum year
 				housespec->max_year = buf->ReadWord();
+				if (housespec->max_year == UINT16_MAX) housespec->max_year = CalendarTime::MAX_YEAR;
 				break;
 
 			case 0x23: { // variable length cargo types accepted