diff --git a/pkg/output/fields.go b/pkg/output/fields.go
index cf074a83..628ecb1a 100644
--- a/pkg/output/fields.go
+++ b/pkg/output/fields.go
@@ -185,9 +185,9 @@ func formatField(output *Result, fields string) []fieldOutput {
 				}
 			}
 		default:
-			for k, v := range output.Request.CustomFields {
+			if v, ok := output.Request.CustomFields[f]; ok {
 				for _, r := range v {
-					svalue = append(svalue, fieldOutput{field: k, value: r})
+					svalue = append(svalue, fieldOutput{field: f, value: r})
 				}
 			}
 		}