diff --git a/config.lua b/config.lua
index 6aa9f4d..205c2eb 100644
--- a/config.lua
+++ b/config.lua
@@ -85,6 +85,8 @@ Config.OpenKey = Keys["Y"]
 
 Config.OpenTime = 750
 
+Config.UseLimitSystem = true -- If true, default old esx inventory limit system will be used, if set to false, new esx inventory weigh system will be used
+
 -- Limit, unit can be whatever you want. Originally grams (as average people can hold 25kg)
 Config.Limit = 25000
 
diff --git a/server/esx_trunk-sv.lua b/server/esx_trunk-sv.lua
index 6906c29..458c24f 100644
--- a/server/esx_trunk-sv.lua
+++ b/server/esx_trunk-sv.lua
@@ -98,6 +98,22 @@ ESX.RegisterServerCallback(
     end
 )
 
+function canPlayerCarryItem(targetItem, xPlayer, item, count)
+    if Config.UseLimitSystem then
+        if targetItem.limit == -1 or ((targetItem.count + count) <= targetItem.limit) then
+            return(true)
+        else
+            return(false)
+        end
+    else
+        if xPlayer.canCarryItem(item, count) then
+            return(true)
+        else
+            return(false)
+        end
+    end
+end
+
 RegisterServerEvent("esx_inventoryhud_trunk:getItem")
 AddEventHandler(
     "esx_inventoryhud_trunk:getItem",
@@ -107,7 +123,7 @@ AddEventHandler(
 
         if type == "item_standard" then
             local targetItem = xPlayer.getInventoryItem(item)
-            if targetItem.limit == -1 or ((targetItem.count + count) <= targetItem.limit) then
+            if canPlayerCarryItem(targetItem, xPlayer, item, count) then
                 TriggerEvent(
                     "esx_inventoryhud_trunk:getSharedDataStore",
                     plate,