diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fa8b73e4498749dcfe6d9d9adb282d5d6c5413e..772cb75c4cedc07237b70d53e5209d32cb16bd82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr
 ### Added
 - New Lua runtime functions to generate JWT tokens.
 - New Lua runtime functions to hash data using RSA SHA256.
+- Print max number of OS threads setting in server startup logs.
 
 ### Changed
 - Log more information when authoritative match handlers receive too many data messages.
diff --git a/main.go b/main.go
index a009de006a84406c0f9dedc221fa10da7c5363cb..52131be0d3d18da538764539bc6359052c0c9eb6 100644
--- a/main.go
+++ b/main.go
@@ -84,7 +84,7 @@ func main() {
 	configWarnings := server.CheckConfig(logger, config)
 
 	startupLogger.Info("Nakama starting")
-	startupLogger.Info("Node", zap.String("name", config.GetName()), zap.String("version", semver), zap.String("runtime", runtime.Version()), zap.Int("cpu", runtime.NumCPU()))
+	startupLogger.Info("Node", zap.String("name", config.GetName()), zap.String("version", semver), zap.String("runtime", runtime.Version()), zap.Int("cpu", runtime.NumCPU()), zap.Int("proc", runtime.GOMAXPROCS(0)))
 	startupLogger.Info("Data directory", zap.String("path", config.GetDataDir()))
 	startupLogger.Info("Database connections", zap.Strings("dsns", config.GetDatabase().Addresses))