diff --git a/resources/[essential]/es_extended/client/functions.lua b/resources/[essential]/es_extended/client/functions.lua
index bb508164..3b70390e 100644
--- a/resources/[essential]/es_extended/client/functions.lua
+++ b/resources/[essential]/es_extended/client/functions.lua
@@ -46,11 +46,11 @@ ESX.ShowNotification = function(msg)
 	DrawNotification(0,1)
 end
 
-ESX.TriggerServerCallback = function(name, cb, a, b, c, d, e, f, g ,h ,i ,j ,k, l, m, n, o, p, q, r, s, t, u ,v ,w, x ,y ,z)
+ESX.TriggerServerCallback = function(name, cb, ...)
 	
 	ESX.ServerCallbacks[ESX.CurrentRequestId] = cb
 	
-	TriggerServerEvent('esx:triggerServerCallback', name, ESX.CurrentRequestId, a, b, c, d, e, f, g ,h ,i ,j ,k, l, m, n, o, p, q, r, s, t, u ,v ,w, x ,y ,z)
+	TriggerServerEvent('esx:triggerServerCallback', name, ESX.CurrentRequestId, ...)
 	
 	if ESX.CurrentRequestId < 65535 then
 		ESX.CurrentRequestId = ESX.CurrentRequestId + 1
diff --git a/resources/[essential]/es_extended/server/common.lua b/resources/[essential]/es_extended/server/common.lua
index b001fcaa..ffadee09 100644
--- a/resources/[essential]/es_extended/server/common.lua
+++ b/resources/[essential]/es_extended/server/common.lua
@@ -54,3 +54,19 @@ AddEventHandler('esx:playerLoaded', function(source)
 	}
 
 end)
+
+RegisterServerEvent('esx:clientLog')
+AddEventHandler('esx:clientLog', function(msg)
+	RconPrint(msg .. "\n")
+end)
+
+RegisterServerEvent('esx:triggerServerCallback')
+AddEventHandler('esx:triggerServerCallback', function(name, requestId, ...)
+	
+	local _source = source
+	
+	ESX.TriggerServerCallback(name, requestID, _source, function(...)
+		TriggerClientEvent('esx:serverCallback', _source, requestId, ...)
+	end, ...)
+
+end)
\ No newline at end of file
diff --git a/resources/[essential]/es_extended/server/functions.lua b/resources/[essential]/es_extended/server/functions.lua
index f3a25eea..c8dbc033 100644
--- a/resources/[essential]/es_extended/server/functions.lua
+++ b/resources/[essential]/es_extended/server/functions.lua
@@ -24,8 +24,8 @@ ESX.RegisterServerCallback = function(name, cb)
 	ESX.ServerCallbacks[name] = cb
 end
 
-ESX.TriggerServerCallback = function(name, requestId, source, cb, a, b, c, d, e, f, g ,h ,i ,j ,k, l, m, n, o, p, q, r, s, t, u ,v ,w, x ,y ,z)
-	ESX.ServerCallbacks[name](source, cb, a, b, c, d, e, f, g ,h ,i ,j ,k, l, m, n, o, p, q, r, s, t, u ,v ,w, x ,y ,z)
+ESX.TriggerServerCallback = function(name, requestId, source, cb, ...)
+	ESX.ServerCallbacks[name](source, cb, ...)
 end
 
 ESX.SavePlayer = function(xPlayer, cb)
@@ -194,16 +194,3 @@ ESX.GetWeaponLabel = function(name)
 	end
 
 end
-
-RegisterServerEvent('esx:clientLog')
-AddEventHandler('esx:clientLog', function(msg)
-	RconPrint(msg .. "\n")
-end)
-
-RegisterServerEvent('esx:triggerServerCallback')
-AddEventHandler('esx:triggerServerCallback', function(name, requestId, a, b, c, d, e, f, g ,h ,i ,j ,k, l, m, n, o, p, q, r, s, t, u ,v ,w, x ,y ,z)
-	local _source = source
-	ESX.TriggerServerCallback(name, requestID, _source, function(a, b, c, d, e, f, g ,h ,i ,j ,k, l, m, n, o, p, q, r, s, t, u ,v ,w, x ,y ,z)
-		TriggerClientEvent('esx:serverCallback', _source, requestId, a, b, c, d, e, f, g ,h ,i ,j ,k, l, m, n, o, p, q, r, s, t, u ,v ,w, x ,y ,z)
-	end, a, b, c, d, e, f, g ,h ,i ,j ,k, l, m, n, o, p, q, r, s, t, u ,v ,w, x ,y ,z)
-end)