diff --git a/[core]/es_extended/server/bridge/inventory/oxinventory.lua b/[core]/es_extended/server/bridge/inventory/oxinventory.lua
index 62b4c2afd..6dcf5becd 100644
--- a/[core]/es_extended/server/bridge/inventory/oxinventory.lua
+++ b/[core]/es_extended/server/bridge/inventory/oxinventory.lua
@@ -1,3 +1,10 @@
+if Config.CustomInventory == "auto" and GetResourceState("ox_inventory") ~= "missing" then 
+    Config.OxInventory = true 
+    Config.CustomInventory = "ox"
+    SetConvarReplicated("inventory:framework", "esx")
+    SetConvarReplicated("inventory:weight", Config.MaxWeight * 1000)
+end
+
 if Config.CustomInventory ~= "ox" then return end
 
 MySQL.ready(function()
diff --git a/[core]/es_extended/shared/config/main.lua b/[core]/es_extended/shared/config/main.lua
index 2c3756053..1c8a28a54 100644
--- a/[core]/es_extended/shared/config/main.lua
+++ b/[core]/es_extended/shared/config/main.lua
@@ -1,7 +1,9 @@
 Config = {}
 
--- for ox inventory, use Config.CustomInventory = "ox", for others, set to "resource_name"
-Config.CustomInventory = false
+-- false = no custom inventory 
+-- "ox" = ox_inventory 
+-- for other inventories use "inventory_name"
+Config.CustomInventory = "auto" 
 
 Config.Accounts = {
     bank = {