diff --git a/cmd/soundtouch-cli/cmd_info.go b/cmd/soundtouch-cli/cmd_info.go
index 448d3e3..d325743 100644
--- a/cmd/soundtouch-cli/cmd_info.go
+++ b/cmd/soundtouch-cli/cmd_info.go
@@ -235,7 +235,8 @@ func getTrackInfo(c *cli.Context) error {
 	clientConfig := GetClientConfig(c)
 	PrintDeviceHeader("Getting track information", clientConfig.Host, clientConfig.Port)
 
-	fmt.Println("⚠️  WARNING: /trackInfo endpoint times out on real devices. Use 'now' command instead.")
+	fmt.Println("⚠️  WARNING: /trackInfo endpoint times out on real devices.")
+	fmt.Println("   Use 'soundtouch-cli now' (playback status) command instead for track information.")
 
 	client, err := CreateSoundTouchClient(clientConfig)
 	if err != nil {
diff --git a/cmd/soundtouch-cli/main.go b/cmd/soundtouch-cli/main.go
index e3fc315..1543d5c 100644
--- a/cmd/soundtouch-cli/main.go
+++ b/cmd/soundtouch-cli/main.go
@@ -223,7 +223,7 @@ func main() {
 			// Track info
 			{
 				Name:   "track",
-				Usage:  "Get track information (WARNING: times out on real devices, use 'now' instead)",
+				Usage:  "Get track information (WARNING: times out on real devices, use playback 'now' command instead)",
 				Action: getTrackInfo,
 				Before: RequireHost,
 			},
diff --git a/docs/API-Endpoints-Overview.md b/docs/API-Endpoints-Overview.md
index 3b87966..e30e385 100644
--- a/docs/API-Endpoints-Overview.md
+++ b/docs/API-Endpoints-Overview.md
@@ -286,9 +286,9 @@ Checks if bass customization is supported on the device.
 ### GET /trackInfo ❌ **Not Working**
 Gets track information (duplicate of `/now_playing` per official API).
 
-**Status**: Documented in official API but times out on real devices (AllegroWebserver timeout). Use `/now_playing` instead.
+**Status**: Documented in official API but times out on real devices (AllegroWebserver timeout). Use `/now_playing` endpoint instead for track information.
 
-**Implementation**: Available via `GetTrackInfo()` method but not functional on hardware.
+**Implementation**: Available via `GetTrackInfo()` method but not functional on hardware. Use `GetNowPlaying()` method instead.
 
 ### Zone Slave Management ✅ **Implemented**
 Both official low-level endpoints and high-level zone management are available: