diff --git a/common/city.cpp b/common/city.cpp
index 909a6556a5..5cc8738210 100644
--- a/common/city.cpp
+++ b/common/city.cpp
@@ -2873,7 +2873,8 @@ void set_city_production(struct city *pcity,
   {
     pcity->waste[o] =
         city_waste(pcity, o, pcity->prod[o] * pcity->bonus[o] / 100, nullptr,
-                   gov_centers, pcwaste ? &pcwaste->at(o) : nullptr);
+                   gov_centers,
+                   pcwaste && !pcwaste->empty() ? &pcwaste->at(o) : nullptr);
   }
   output_type_iterate_end;