diff --git a/src/economy.c b/src/economy.c
index bb24fd5e5..bf7e4f288 100644
--- a/src/economy.c
+++ b/src/economy.c
@@ -1039,12 +1039,10 @@ static bool maintain(building * b, bool first)
     u = building_owner(b);
     if (u == NULL)
         return false;
-    /* If the owner is the region owner, check if biggest castle has the dontpay flag */
+    /* If the owner is the region owner, check if dontpay flag is set for the building where he is in */
     if (check_param(global.parameters, "rules.region_owner_pay_building", b->type->_name)) {
-        if (u == building_owner(largestbuilding(r, &cmp_taxes, false))) {
-            if (fval(u->building, BLD_DONTPAY)) {
-                return false;
-            }
+        if (fval(u->building, BLD_DONTPAY)) {
+            return false;
         }
     }
     for (c = 0; b->type->maintenance[c].number; ++c) {