diff --git a/pms_api_rest/datamodels/pms_room_type.py b/pms_api_rest/datamodels/pms_room_type.py
index 48c4370ba..b96b869eb 100644
--- a/pms_api_rest/datamodels/pms_room_type.py
+++ b/pms_api_rest/datamodels/pms_room_type.py
@@ -17,3 +17,5 @@ class PmsRoomTypeInfo(Datamodel):
     defaultCode = fields.String(required=False, allow_none=True)
     classId = fields.Integer(required=False, allow_none=True)
     price = fields.Float(required=False, allow_none=True)
+    defaultMaxAvail = fields.Integer(required=False, allow_none=True)
+    defaultQuota = fields.Integer(required=False, allow_none=True)
diff --git a/pms_api_rest/services/pms_availability_plan_service.py b/pms_api_rest/services/pms_availability_plan_service.py
index a6acb6851..d1b20f954 100644
--- a/pms_api_rest/services/pms_availability_plan_service.py
+++ b/pms_api_rest/services/pms_availability_plan_service.py
@@ -171,10 +171,8 @@ class PmsAvailabilityPlanService(Component):
                         closed=rule["closed"],
                         closedDeparture=rule["closed_departure"],
                         closedArrival=rule["closed_arrival"],
-                        quota=rule["quota"] if rule["quota"] != -1 else 0,
-                        maxAvailability=rule["max_avail"]
-                        if rule["max_avail"] != -1
-                        else 0,
+                        quota=rule["quota"],
+                        maxAvailability=rule["max_avail"],
                         availabilityPlanId=availability_plan_id,
                     )
                     result.append(availability_plan_rule_info)
diff --git a/pms_api_rest/services/pms_room_type_service.py b/pms_api_rest/services/pms_room_type_service.py
index 6f5dc5c25..d2205cad1 100644
--- a/pms_api_rest/services/pms_room_type_service.py
+++ b/pms_api_rest/services/pms_room_type_service.py
@@ -61,6 +61,8 @@ class PmsRoomTypeService(Component):
                     defaultCode=room.default_code,
                     price=round(room.list_price, 2),
                     classId=room.class_id,
+                    defaultMaxAvail=room.default_max_avail,
+                    defaultQuota=room.default_quota,
                 )
             )
         return result_rooms