diff --git a/internal/support/cli/args.go b/internal/support/cli/args.go
index 41249986..d1bc5510 100644
--- a/internal/support/cli/args.go
+++ b/internal/support/cli/args.go
@@ -64,6 +64,14 @@ func ParseArgs() (Args, interface{}) {
 		args.Filter[key] = append(args.Filter[key], val)
 	}
 
+	for i, value := range args.RemoteAgent {
+		args.RemoteAgent[i] = strings.TrimSpace(value)
+	}
+
+	for i, value := range args.RemoteHost {
+		args.RemoteHost[i] = strings.TrimSpace(value)
+	}
+
 	if args.TimeoutString != "" {
 		timeout, err := time.ParseDuration(args.TimeoutString)
 		if err != nil {