diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index b3fa3311..3bbad2ba 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -448,6 +448,7 @@ void Profiler::Worker()
     const auto pnsz = std::min<size_t>( strlen( procname ), WelcomeMessageProgramNameSize - 1 );
 
     const auto hostinfo = GetHostInfo();
+    const auto hisz = std::min<size_t>( strlen( hostinfo ), WelcomeMessageHostInfoSize - 1 );
 
     while( m_timeBegin.load( std::memory_order_relaxed ) == 0 ) std::this_thread::sleep_for( std::chrono::milliseconds( 10 ) );
 
@@ -467,6 +468,8 @@ void Profiler::Worker()
     MemWrite( &welcome.onDemand, onDemand );
     memcpy( welcome.programName, procname, pnsz );
     memset( welcome.programName + pnsz, 0, WelcomeMessageProgramNameSize - pnsz );
+    memcpy( welcome.hostInfo, hostinfo, hisz );
+    memset( welcome.hostInfo + hisz, 0, WelcomeMessageHostInfoSize - hisz );
 
     moodycamel::ConsumerToken token( s_queue );
 
diff --git a/common/TracyProtocol.hpp b/common/TracyProtocol.hpp
index baa07543..f7275fab 100644
--- a/common/TracyProtocol.hpp
+++ b/common/TracyProtocol.hpp
@@ -28,6 +28,7 @@ enum ServerQuery : uint8_t
 };
 
 enum { WelcomeMessageProgramNameSize = 64 };
+enum { WelcomeMessageHostInfoSize = 1024 };
 
 #pragma pack( 1 )
 
@@ -41,6 +42,7 @@ struct WelcomeMessage
     uint64_t epoch;
     uint8_t onDemand;
     char programName[WelcomeMessageProgramNameSize];
+    char hostInfo[WelcomeMessageHostInfoSize];
 };
 
 enum { WelcomeMessageSize = sizeof( WelcomeMessage ) };