@@ -21,10 +21,18 @@ func (cli *Client) ImageImport(ctx context.Context, source image.ImportSource, r

 	}

 	query := url.Values{}

-	query.Set("fromSrc", source.SourceName)

-	query.Set("repo", ref)

-	query.Set("tag", options.Tag)

-	query.Set("message", options.Message)

+	if source.SourceName != "" {

+		query.Set("fromSrc", source.SourceName)

+	}

+	if ref != "" {

+		query.Set("repo", ref)

+	}

+	if options.Tag != "" {

+		query.Set("tag", options.Tag)

+	}

+	if options.Message != "" {

+		query.Set("message", options.Message)

+	}

 	if options.Platform != "" {

 		query.Set("platform", strings.ToLower(options.Platform))

 	}

@@ -37,9 +37,7 @@ func TestImageImport(t *testing.T) {

 			doc: "no options",

 			expectedQueryParams: url.Values{

 				"fromSrc": {"image_source"},

-				"message": {""},

 				"repo":    {"repository_name:imported"},

-				"tag":     {""},

 			},

 		},

 		{

@@ -64,10 +62,8 @@ func TestImageImport(t *testing.T) {

 			},

 			expectedQueryParams: url.Values{

 				"fromSrc":  {"image_source"},

-				"message":  {""},

 				"platform": {"linux/amd64"},

 				"repo":     {"repository_name:imported"},

-				"tag":      {""},

 			},

 		},

 	}