diff --git a/internal/pkg/commands/devices.go b/internal/pkg/commands/devices.go
index 8b603f8..36c4762 100644
--- a/internal/pkg/commands/devices.go
+++ b/internal/pkg/commands/devices.go
@@ -240,7 +240,8 @@
 		dm["host_and_port"] = options.HostAndPort
 	} else if options.IPAddress != "" {
 		dm["ipv4_address"] = options.IPAddress
-	} else if options.MACAddress != "" {
+	}
+	if options.MACAddress != "" {
 		dm["mac_address"] = strings.ToLower(options.MACAddress)
 	}
 	if options.DeviceType != "" {