diff --git a/locale/en/mtn_fortress_v3.cfg b/locale/en/mtn_fortress_v3.cfg
index 637682d5..62dce4b6 100644
--- a/locale/en/mtn_fortress_v3.cfg
+++ b/locale/en/mtn_fortress_v3.cfg
@@ -102,7 +102,7 @@ chest=Upgrades the amount of chests that can be placed outside. [__1__/__2__]
 locomotive_max_health=Upgrades the train health. [__1__/__2__]
 locomotive_aura_radius=Upgrades the train aura radius. [__1__/__2__]\n[Limited to save UPS]
 global_car_health_modifier=Grants all cars/tanks/spidertrons a global health modifier.
-xp_points_boost=Increases the amount of XP you get inside train aura [__1__/♾]
+xp_points_boost=Increases the amount of XP you get inside train aura [__1__/__2__]
 mystical_chest=Rerolls the mystical chest.
 explosive_bullets=Upgrades ordinary SMG ammo to explosive bullets.
 purchase_pickaxe=Upgrade the teams Pickaxe to tier: __1__ [__2__/__3__]
diff --git a/maps/mountain_fortress_v3/locomotive/market.lua b/maps/mountain_fortress_v3/locomotive/market.lua
index b57dcecb..142bc0f2 100644
--- a/maps/mountain_fortress_v3/locomotive/market.lua
+++ b/maps/mountain_fortress_v3/locomotive/market.lua
@@ -183,16 +183,29 @@ local function get_items()
         }
     end
 
-    main_market_items['xp_points_boost'] = {
-        stack = 1,
-        value = 'coin',
-        price = xp_point_boost_cost,
-        tooltip = ({'main_market.xp_points_boost', upgrades.xp_points_upgrade}),
-        sprite = 'achievement/trans-factorio-express',
-        enabled = true,
-        upgrade = true,
-        static = true
-    }
+    if upgrades.xp_points_upgrade == market_limits.xp_points_limit then
+        main_market_items['xp_points_boost'] = {
+            stack = 1,
+            value = 'coin',
+            price = xp_point_boost_cost,
+            tooltip = ({'locomotive.limit_reached'}),
+            sprite = 'achievement/trans-factorio-express',
+            enabled = false,
+            upgrade = true,
+            static = true
+        }
+    else
+        main_market_items['xp_points_boost'] = {
+            stack = 1,
+            value = 'coin',
+            price = xp_point_boost_cost,
+            tooltip = ({'main_market.xp_points_boost', upgrades.xp_points_upgrade, market_limits.xp_points_limit}),
+            sprite = 'achievement/trans-factorio-express',
+            enabled = true,
+            upgrade = true,
+            static = true
+        }
+    end
 
     main_market_items['redraw_mystical_chest'] = {
         stack = 1,
diff --git a/maps/mountain_fortress_v3/table.lua b/maps/mountain_fortress_v3/table.lua
index 96810949..65c6ae20 100644
--- a/maps/mountain_fortress_v3/table.lua
+++ b/maps/mountain_fortress_v3/table.lua
@@ -221,14 +221,15 @@ function Public.reset_main_table()
         chests_outside_limit = 8,
         aura_limit = 100, -- limited to save UPS
         pickaxe_tier_limit = 59,
-        health_upgrades_limit = 100
+        health_upgrades_limit = 100,
+        xp_points_limit = 40
     }
     this.marked_fixed_prices = {
         chests_outside_cost = 3000,
         health_cost = 14000,
         pickaxe_cost = 3000,
         aura_cost = 4000,
-        xp_point_boost_cost = 5000,
+        xp_point_boost_cost = 2500,
         explosive_bullets_cost = 10000,
         flamethrower_turrets_cost = 3000,
         land_mine_cost = 2,