diff --git a/internal/app/wwclient/root.go b/internal/app/wwclient/root.go
index 7cd728bc..3f9c08b3 100644
--- a/internal/app/wwclient/root.go
+++ b/internal/app/wwclient/root.go
@@ -126,6 +126,15 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) {
 		localUUID, _ = sysinfoDump.UUID()
 		x := smbiosDump.SystemEnclosure()
 		tag = strings.ReplaceAll(x.AssetTagNumber(), " ", "_")
+		if tag == "Unknown" {
+			dmiOut, err := exec.Command("dmidecode", "-s", "chassis-asset-tag").Output()
+			if err == nil {
+				chassisAssetTag := strings.TrimSpace(string(dmiOut))
+				if chassisAssetTag != "" {
+					tag = chassisAssetTag
+				}
+			}
+		}
 	} else {
 		// Raspberry Pi serial and DUID locations
 		// /sys/firmware/devicetree/base/serial-number