diff --git a/client/TracyCallstack.cpp b/client/TracyCallstack.cpp
index 0d32390a..174864ca 100644
--- a/client/TracyCallstack.cpp
+++ b/client/TracyCallstack.cpp
@@ -87,7 +87,7 @@ CallstackEntryData DecodeCallstackPtr( uint64_t ptr )
 
 #elif TRACY_HAS_CALLSTACK >= 2
 
-enum { MaxCbTrace = 1 };
+enum { MaxCbTrace = 16 };
 
 struct backtrace_state* cb_bts;
 int cb_num;
@@ -223,8 +223,8 @@ CallstackEntryData DecodeCallstackPtr( uint64_t ptr )
 {
     cb_num = 0;
     backtrace_pcinfo( cb_bts, ptr, CallstackDataCb, CallstackErrorCb, nullptr );
-    assert( cb_num == 1 );
-    return { cb_data, cb_num };
+    assert( cb_num > 0 );
+    return { cb_data, uint8_t( cb_num ) };
 }
 
 #endif