diff --git a/imports/callback/client.lua b/imports/callback/client.lua
index 188e0ed..e47a3cc 100644
--- a/imports/callback/client.lua
+++ b/imports/callback/client.lua
@@ -50,7 +50,7 @@ local function triggerServerCallback(_, event, delay, cb, ...)
 			return promise:resolve(response and { msgpack.unpack(response) } or {})
 		end
 
-		return cb and cb(msgpack.unpack(response))
+		return cb and cb(response and msgpack.unpack(response))
 	end
 
 	if promise then
diff --git a/imports/callback/server.lua b/imports/callback/server.lua
index dfc559a..184dd31 100644
--- a/imports/callback/server.lua
+++ b/imports/callback/server.lua
@@ -31,7 +31,7 @@ local function triggerClientCallback(_, event, playerId, cb, ...)
 			return promise:resolve(response and { msgpack.unpack(response) } or {})
 		end
 
-		return cb and cb(msgpack.unpack(response))
+		return cb and cb(response and msgpack.unpack(response))
 	end
 
 	if promise then
@@ -74,4 +74,6 @@ function lib.callback.register(name, cb)
 	end)
 end
 
-return lib.callback
\ No newline at end of file
+return lib.callback
+
+