diff --git a/client/system/info_linux.go b/client/system/info_linux.go
index 1c5405d4d..d85a6faec 100644
--- a/client/system/info_linux.go
+++ b/client/system/info_linux.go
@@ -89,5 +89,9 @@ func _getInfo() string {
 func sysInfo() (serialNumber string, productName string, manufacturer string) {
 	var si sysinfo.SysInfo
 	si.GetSysInfo()
-	return si.Chassis.Serial, si.Product.Name, si.Product.Vendor
+	serial := si.Chassis.Serial
+	if (serial == "Default string" || serial == "") && si.Product.Serial != "" {
+		serial = si.Product.Serial
+	}
+	return serial, si.Product.Name, si.Product.Vendor
 }