diff --git a/src/subsidy_base.h b/src/subsidy_base.h
index 16a4930cdd..38043a6d7c 100644
--- a/src/subsidy_base.h
+++ b/src/subsidy_base.h
@@ -15,7 +15,7 @@
 #include "subsidy_type.h"
 #include "core/pool_type.hpp"
 
-typedef Pool<Subsidy, SubsidyID, 1, 256> SubsidyPool;
+using SubsidyPool = Pool<Subsidy, SubsidyID, 1, SubsidyID::End().base()>;
 extern SubsidyPool _subsidy_pool;
 
 /** Struct about subsidies, offered and awarded */
diff --git a/src/subsidy_type.h b/src/subsidy_type.h
index 2f613c4e90..1d4dd17d19 100644
--- a/src/subsidy_type.h
+++ b/src/subsidy_type.h
@@ -20,7 +20,7 @@ enum PartOfSubsidy : uint8_t {
 };
 DECLARE_ENUM_AS_BIT_SET(PartOfSubsidy)
 
-typedef uint16_t SubsidyID; ///< ID of a subsidy
+using SubsidyID = PoolID<uint16_t, struct SubsidyIDTag, 256, 0xFFFF>; ///< ID of a subsidy
 struct Subsidy;
 
 #endif /* SUBSIDY_TYPE_H */